From: Luke Leighton <lkcl@samba.org>
Date: Mon, 8 Feb 1999 01:46:46 +0000 (+0000)
Subject: reload_services needs to be called prior to init_files but after
X-Git-Tag: samba-4.0.0alpha6~801^2~20928
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=37c9693fc8055773812ed86d91f9dfcc554eea30;hp=6d698d51b324f84b2d2b4c56ea1e728c0c30b220

reload_services needs to be called prior to init_files but after
get_myname.
(This used to be commit 9ab81caa065a0e08368fc9137d42ed810fd4b817)
---

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 0b332db0fdf..9b397bcdeb7 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.