svn commit: samba r20966 - in branches: SAMBA_3_0/source/smbd SAMBA_3_0_24/source/smbd

[jpeach at samba.org]

Author: jpeach
Date: 2007-01-23 04:12:51 +0000 (Tue, 23 Jan 2007)
New Revision: 20966

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20966

Log:
Only attempt to reload the config file atfer the fork point if we
are in daemon mode. If we are in inetd mode, there's really no point
in rechecking it so soon.

Modified:
   branches/SAMBA_3_0/source/smbd/server.c
   branches/SAMBA_3_0_24/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/server.c	2007-01-23 03:03:24 UTC (rev 20965)
+++ branches/SAMBA_3_0/source/smbd/server.c	2007-01-23 04:12:51 UTC (rev 20966)
@@ -1065,8 +1065,12 @@
 
 	init_modules();
 
-	/* possibly reload the services file. */
-	reload_services(True);
+	/* Possibly reload the services file. Only worth doing in
+	 * daemon mode. In inetd mode, we know we only just loaded this.
+	 */
+	if (is_daemon) {
+		reload_services(True);
+	}
 
 	if (!init_account_policy()) {
 		DEBUG(0,("Could not open account policy tdb.\n"));

Modified: branches/SAMBA_3_0_24/source/smbd/server.c
===================================================================
--- branches/SAMBA_3_0_24/source/smbd/server.c	2007-01-23 03:03:24 UTC (rev 20965)
+++ branches/SAMBA_3_0_24/source/smbd/server.c	2007-01-23 04:12:51 UTC (rev 20966)
@@ -1055,8 +1055,12 @@
 
 	init_modules();
 
-	/* possibly reload the services file. */
-	reload_services(True);
+	/* Possibly reload the services file. Only worth doing in
+	 * daemon mode. In inetd mode, we know we only just loaded this.
+	 */
+	if (is_daemon) {
+		reload_services(True);
+	}
 
 	if (!init_account_policy()) {
 		DEBUG(0,("Could not open account policy tdb.\n"));