svn commit: samba r26400 - in branches/SAMBA_4_0: . source/smbd

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-11 22:23:06 +0000 (Tue, 11 Dec 2007)
New Revision: 26400

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26400

Log:
Don't try to do character conversion before smb.conf has been parsed.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/smbd/server.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c	2007-12-11 14:31:01 UTC (rev 26399)
+++ branches/SAMBA_4_0/source/smbd/server.c	2007-12-11 22:23:06 UTC (rev 26400)
@@ -226,7 +226,7 @@
 			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 @@
 	}
 
 	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);