summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1999-02-08 01:46:46 +0000
committerLuke Leighton <lkcl@samba.org>1999-02-08 01:46:46 +0000
commit37c9693fc8055773812ed86d91f9dfcc554eea30 (patch)
tree0cf3645a3a351e7f83d615ebbf2e609c3b3a62b1 /source3/smbd
parent6d698d51b324f84b2d2b4c56ea1e728c0c30b220 (diff)
downloadsamba-37c9693fc8055773812ed86d91f9dfcc554eea30.tar.gz
samba-37c9693fc8055773812ed86d91f9dfcc554eea30.tar.bz2
samba-37c9693fc8055773812ed86d91f9dfcc554eea30.zip
reload_services needs to be called prior to init_files but after
get_myname. (This used to be commit 9ab81caa065a0e08368fc9137d42ed810fd4b817)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0b332db0fd..9b397bcdeb 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -446,8 +446,6 @@ void exit_server(char *reason)
****************************************************************************/
static void init_structs(void)
{
- get_myname(myhostname,NULL);
-
conn_init();
file_init();
init_rpc_pipe_hnd(); /* for RPC pipes */
@@ -614,11 +612,13 @@ static void usage(char *pname)
exit(1);
}
- init_structs();
-
+ get_myname(myhostname,NULL);
+
if (!reload_services(False))
return(-1);
+ init_structs();
+
/*
* Set the machine NETBIOS name if not already
* set from the config file.