summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-01-23 04:12:51 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:22 -0500
commit23e227ac391a3f674712bdd09a0581a02cbc8a7e (patch)
tree249a0032c6c3c98712e898da8f063638a31a2d58
parent24e25ae7617165a929d48c9e154a62d5c99eb73f (diff)
downloadsamba-23e227ac391a3f674712bdd09a0581a02cbc8a7e.tar.gz
samba-23e227ac391a3f674712bdd09a0581a02cbc8a7e.tar.bz2
samba-23e227ac391a3f674712bdd09a0581a02cbc8a7e.zip
r20966: 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. (This used to be commit 029d4bb5e3ea02a8a396adc3ca564a714bcdfdb8)
-rw-r--r--source3/smbd/server.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index e2f73285b3..0bb4ad5b04 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1065,8 +1065,12 @@ extern void build_options(BOOL screen);
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"));