diff options
| author | Jeremy Allison <jra@samba.org> | 1998-09-30 01:05:51 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-09-30 01:05:51 +0000 |
| commit | 5a8458c377b6901b67a039eafbd5727ed1207cf3 (patch) | |
| tree | d988e90d87ee84a39e557099623db3ca9d9634fa /source3/smbd | |
| parent | 9a5f40cadfa827d56b3ca0ae4b792b860d332b4f (diff) | |
| download | samba-5a8458c377b6901b67a039eafbd5727ed1207cf3.tar.gz samba-5a8458c377b6901b67a039eafbd5727ed1207cf3.tar.bz2 samba-5a8458c377b6901b67a039eafbd5727ed1207cf3.zip | |
libsmb/clientgen.c: Fixed signed/unsigned compile warnings spotted by Herb.
param/loadparm.c:
smbd/oplock.c: Allow kernel oplocks to be turned off in the smb.conf file.
smbd/server.c: Move init_structs() to after the smb.conf file is loaded - preparation
for making a "max open files" parameter.
Jeremy.
(This used to be commit 6a261517a09b005f502a37941431308fa8bf2c5c)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/oplock.c | 6 | ||||
| -rw-r--r-- | source3/smbd/server.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index d5c06312f5..c5a19df0e9 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -1077,9 +1077,11 @@ Disabling kernel oplock support.\n", strerror(errno) )); oplock_pipe_write = pfd[1]; close(fd); - DEBUG(3,("check_kernel_oplocks: Kernel oplocks enabled.\n")); - lp_set_kernel_oplocks(True); + + DEBUG(3,("check_kernel_oplocks: Kernel oplocks available and set to %s.\n", + lp_kernel_oplocks() ? "True" : "False" )); + } #endif /* HAVE_KERNEL_OPLOCKS */ } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index fb97cf8380..62f2bcea9f 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -626,11 +626,11 @@ static void usage(char *pname) exit(1); } - init_structs(); - if (!reload_services(False)) return(-1); + init_structs(); + #ifdef WITH_SSL { extern BOOL sslEnabled; |