← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/samba/oneiric-security

« back to all changes in this revision

Viewing changes to source/smbd/msdfs.c

  • Committer: Bazaar Package Importer
  • Author(s): Adam Conrad
  • Date: 2005-07-21 17:53:23 UTC
  • mfrom: (0.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050721175323-m3oh6aoigywohfnq
Tags: 3.0.14a-6ubuntu1
Resynchronise with Debian, resolving merge conflicts (#12360)

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/smbd/msdfs.c
22
22
 
23
23
#include "includes.h"
24
24
 
25
 
extern fstring local_machine;
26
25
extern uint32 global_client_caps;
27
26
 
28
27
/**********************************************************************
462
461
        parse_dfs_path(pathname, &dp);
463
462
 
464
463
        /* Verify hostname in path */
465
 
        if (local_machine && (!strequal(local_machine, dp.hostname))) {
 
464
        if ( !strequal(get_local_machine_name(), dp.hostname) ) {
466
465
                /* Hostname mismatch, check if one of our IP addresses */
467
466
                if (!ismyip(*interpret_addr2(dp.hostname))) {
468
467
                        DEBUG(3, ("get_referred_path: Invalid hostname %s in path %s\n",
810
809
        parse_dfs_path(pathname,&dp);
811
810
 
812
811
        /* check if path is dfs : validate first token */
813
 
        if (local_machine && (!strequal(local_machine,dp.hostname))) {
 
812
        if ( !strequal(get_local_machine_name(),dp.hostname) ) {
814
813
            
815
814
           /* Hostname mismatch, check if one of our IP addresses */
816
815
           if (!ismyip(*interpret_addr2(dp.hostname))) {
978
977
        }
979
978
                
980
979
        slprintf(ref->alternate_path, sizeof(pstring)-1,
981
 
                 "\\\\%s\\%s", local_machine, service_name);
 
980
                 "\\\\%s\\%s", get_local_machine_name(), service_name);
982
981
        cnt++;
983
982
        
984
983
        /* Now enumerate all dfs links */