sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

make sure async dns nmbd child dies

Browse Source 
samba-patches 898
(This used to be commit a954f72fe315ec59bfeb4bd407179bc54689440f)
This commit is contained in:
Andrew Tridgell 2002-07-28 06:26:41 +00:00
parent ed9a219c87
commit 4b68935a51
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/nmbd/asyncdns.c
View File

@ -122,6 +122,7 @@ void kill_async_dns_child(void)
{
if (child_pid > 0) {
kill(child_pid, SIGTERM);
child_pid = -1;
}
}

8
source3/nmbd/nmbd.c
View File

@ -861,8 +861,10 @@ static void usage(char *pname)
DEBUG( 3, ( "Opening sockets %d\n", global_nmb_port ) );
if ( !open_sockets( is_daemon, global_nmb_port ) )
if ( !open_sockets( is_daemon, global_nmb_port ) ) {
kill_async_dns_child();
return 1;
}
/* Determine all the IP addresses we have. */
load_interfaces();
@ -871,6 +873,7 @@ 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);
}
@ -882,6 +885,7 @@ static void usage(char *pname)
if( !initialise_wins() )
{
DEBUG( 0, ( "nmbd: Failed when initialising WINS server.\n" ) );
kill_async_dns_child();
exit(1);
}
@ -896,6 +900,7 @@ 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);
}
@ -906,5 +911,6 @@ static void usage(char *pname)
if (dbf)
x_fclose(dbf);
kill_async_dns_child();
return(0);
}