summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>2000-03-27 00:52:33 +0000
committerLuke Leighton <lkcl@samba.org>2000-03-27 00:52:33 +0000
commit3a290ce80c6d6fc117127e46b2741bba2abff34d (patch)
tree2ce5775c350ab57f451cbd076135bef190aab1df
parent4e7af2b3b580b2b580ca65bc96266d1a9b627f9d (diff)
downloadsamba-3a290ce80c6d6fc117127e46b2741bba2abff34d.tar.gz
samba-3a290ce80c6d6fc117127e46b2741bba2abff34d.tar.bz2
samba-3a290ce80c6d6fc117127e46b2741bba2abff34d.zip
rename static reload_services function to reload_nmbd_services because
it clashes with other reload_services definitions. (This used to be commit affaf9c5411e533a77621574d356e886eea93465)
-rw-r--r--source3/nmbd/nmbd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index 60e7b13b2c..a7cf7560b3 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -246,7 +246,7 @@ static void reload_interfaces(time_t t)
/**************************************************************************** **
reload the services file
**************************************************************************** */
-static BOOL reload_services(BOOL test)
+static BOOL reload_nmbd_services(BOOL test)
{
BOOL ret;
extern fstring remote_machine;
@@ -273,7 +273,7 @@ static BOOL reload_services(BOOL test)
if ( !test )
{
DEBUG( 3, ( "services not loaded\n" ) );
- reload_services( True );
+ reload_nmbd_services( True );
}
/* Do a sanity check for a misconfigured nmbd */
@@ -285,7 +285,7 @@ cannot be set in the smb.conf file. nmbd aborting.\n"));
}
return(ret);
-} /* reload_services */
+} /* reload_nmbd_services */
/**************************************************************************** **
The main select loop.
@@ -465,7 +465,7 @@ static void process(void)
*/
if(reload_after_sighup) {
- reload_services( True );
+ reload_nmbd_services( True );
reopen_logs();
reload_interfaces(0);
reload_after_sighup = False;
@@ -746,7 +746,7 @@ static void usage(char *pname)
DEBUG( 1, ( "Netbios nameserver version %s started.\n", VERSION ) );
DEBUGADD( 1, ( "Copyright Andrew Tridgell 1994-1998\n" ) );
- if ( !reload_services(False) )
+ if ( !reload_nmbd_services(False) )
return(-1);
codepage_initialise(lp_client_code_page());
@@ -754,7 +754,7 @@ static void usage(char *pname)
if(!init_structs())
return -1;
- reload_services( True );
+ reload_nmbd_services( True );
fstrcpy( global_myworkgroup, lp_workgroup() );