diff options
| author | James Peach <jpeach@samba.org> | 2007-01-23 04:12:51 +0000 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-01-23 04:12:51 +0000 |
| commit | dce35fef5e0d6cb1039845268e113673b634ff4e (patch) | |
| tree | 4bdada11147e6dff9721d2368b0a4c96df66ae0b /source | |
| parent | cd33d1ae6ec62bfb24236e152f1a45d7b993249a (diff) | |
| download | samba-dce35fef5e0d6cb1039845268e113673b634ff4e.tar.gz samba-dce35fef5e0d6cb1039845268e113673b634ff4e.tar.xz samba-dce35fef5e0d6cb1039845268e113673b634ff4e.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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/smbd/server.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/smbd/server.c b/source/smbd/server.c index e2f73285b3d..0bb4ad5b04e 100644 --- a/source/smbd/server.c +++ b/source/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")); |