diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-11 22:23:06 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:30 +0100 |
| commit | f9948d18d73fb8d8711c3b5a46b1d83c881a0084 (patch) | |
| tree | 5ecc7a37bf961b996fc182ec98d95fc297e310a0 /source4/smbd/server.c | |
| parent | 68dc2dc526e146dd0ac68d5d68eb55b601282caf (diff) | |
| download | samba-f9948d18d73fb8d8711c3b5a46b1d83c881a0084.tar.gz samba-f9948d18d73fb8d8711c3b5a46b1d83c881a0084.tar.bz2 samba-f9948d18d73fb8d8711c3b5a46b1d83c881a0084.zip | |
r26400: Don't try to do character conversion before smb.conf has been parsed.
(This used to be commit 9faba2874957ce80db202cd9f2cc373e7346381c)
Diffstat (limited to 'source4/smbd/server.c')
| -rw-r--r-- | source4/smbd/server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index e7d7d1a7fc..3f1d3c35d8 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -226,7 +226,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ model = poptGetOptArg(pc); break; default: - d_fprintf(stderr, "\nInvalid option %s: %s\n\n", + fprintf(stderr, "\nInvalid option %s: %s\n\n", poptBadOption(pc, 0), poptStrerror(opt)); poptPrintUsage(pc, stderr, 0); exit(1); @@ -234,7 +234,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ } if (opt_daemon && opt_interactive) { - d_fprintf(stderr,"\nERROR: " + fprintf(stderr,"\nERROR: " "Option -i|--interactive is not allowed together with -D|--daemon\n\n"); poptPrintUsage(pc, stderr, 0); exit(1); |