diff options
Diffstat (limited to 'source3/nmbd/nmbd.c')
| -rw-r--r-- | source3/nmbd/nmbd.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c index 05ea4997d5..d30efb550c 100644 --- a/source3/nmbd/nmbd.c +++ b/source3/nmbd/nmbd.c @@ -269,8 +269,9 @@ static BOOL reload_interfaces(time_t t) static BOOL reload_nmbd_services(BOOL test) { BOOL ret; + extern fstring remote_machine; - set_remote_machine_name("nmbd"); + fstrcpy( remote_machine, "nmbd" ); if ( lp_loaded() ) { pstring fname; @@ -860,10 +861,8 @@ static void usage(char *pname) DEBUG( 3, ( "Opening sockets %d\n", global_nmb_port ) ); - if ( !open_sockets( is_daemon, global_nmb_port ) ) { - kill_async_dns_child(); + if ( !open_sockets( is_daemon, global_nmb_port ) ) return 1; - } /* Determine all the IP addresses we have. */ load_interfaces(); @@ -872,7 +871,6 @@ static void usage(char *pname) if( False == create_subnets() ) { DEBUG(0,("ERROR: Failed when creating subnet lists. Exiting.\n")); - kill_async_dns_child(); exit(1); } @@ -884,7 +882,6 @@ static void usage(char *pname) if( !initialise_wins() ) { DEBUG( 0, ( "nmbd: Failed when initialising WINS server.\n" ) ); - kill_async_dns_child(); exit(1); } @@ -899,7 +896,6 @@ static void usage(char *pname) if( False == register_my_workgroup_and_names() ) { DEBUG(0,("ERROR: Failed when creating my my workgroup. Exiting.\n")); - kill_async_dns_child(); exit(1); } @@ -910,6 +906,5 @@ static void usage(char *pname) if (dbf) x_fclose(dbf); - kill_async_dns_child(); return(0); } |