diff options
| author | Jeremy Allison <jra@samba.org> | 2000-01-08 02:16:15 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2000-01-08 02:16:15 +0000 |
| commit | fab3e0eb08ce3f479131eaea040f3d9215caa038 (patch) | |
| tree | eac369cac554ad8a61ba6cede0a2bb4234775f55 /source3/smbd/server.c | |
| parent | faa302c7688eeb03f543d6dac817b5a80753a9f5 (diff) | |
| download | samba-fab3e0eb08ce3f479131eaea040f3d9215caa038.tar.gz samba-fab3e0eb08ce3f479131eaea040f3d9215caa038.tar.bz2 samba-fab3e0eb08ce3f479131eaea040f3d9215caa038.zip | |
smbd/mangle.c
smbd/negprot.c: Tidyup of static initializers.
smbd/server.c: Fix -l option.
Jeremy.
(This used to be commit d120f22fefde21b38e43ea5ad0180bf27304d2eb)
Diffstat (limited to 'source3/smbd/server.c')
| -rw-r--r-- | source3/smbd/server.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 79d37e5093..bd07ed8458 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -504,6 +504,7 @@ static void usage(char *pname) extern BOOL append_log; /* shall I run as a daemon */ BOOL is_daemon = False; + BOOL specified_logfile = False; int port = SMB_PORT; int opt; extern char *optarg; @@ -536,6 +537,7 @@ static void usage(char *pname) break; case 'l': + specified_logfile = True; pstrcpy(debugf,optarg); break; @@ -597,7 +599,8 @@ static void usage(char *pname) TimeInit(); - pstrcpy(debugf,SMBLOGFILE); + if(!specified_logfile) + pstrcpy(debugf,SMBLOGFILE); pstrcpy(remote_machine, "smb"); @@ -714,10 +717,16 @@ static void usage(char *pname) pidfile_create("smbd"); } - if (!locking_init(0)) + if (!open_sockets(is_daemon,port)) exit(1); - if (!open_sockets(is_daemon,port)) + /* + * Note that this call should be done after the fork() call + * in open_sockets(), as some versions of the locking shared + * memory code register openers in a flat file. + */ + + if (!locking_init(0)) exit(1); if(!initialize_password_db()) |