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

jelmer at samba.org jelmer at samba.org
Tue Oct 12 12:02:20 GMT 2004


Author: jelmer
Date: 2004-10-12 12:02:18 +0000 (Tue, 12 Oct 2004)
New Revision: 2937

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/smbd&rev=2937&nolog=1

Log:
Make sure all memory is initialized 

Modified:
   branches/SAMBA_4_0/source/smbd/server.c


Changeset:
Modified: branches/SAMBA_4_0/source/smbd/server.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/server.c	2004-10-12 11:58:34 UTC (rev 2936)
+++ branches/SAMBA_4_0/source/smbd/server.c	2004-10-12 12:02:18 UTC (rev 2937)
@@ -44,14 +44,14 @@
 	const char *model = "standard";
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon (default)" },
-	{"interactive", 'i', POPT_ARG_VAL, &interactive, True, "Run interactive (not a daemon)"},
-	{"foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools & etc)" },
-	{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
-	{"port", 'p', POPT_ARG_STRING, NULL, 0, "Listen on the specified ports"},
-	{"model", 'M', POPT_ARG_STRING, &model, 0, "select process model"},
 	POPT_COMMON_SAMBA
-	{ NULL }
+	{"daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon (default)" , NULL },
+	{"interactive", 'i', POPT_ARG_VAL, &interactive, True, "Run interactive (not a daemon)", NULL},
+	{"foreground", 'F', POPT_ARG_VAL, &Fork, True, "Run daemon in foreground (for daemontools & etc)" , NULL },
+	{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout", NULL },
+	{"port", 'p', POPT_ARG_STRING, NULL, 0, "Listen on the specified ports", "PORTS"},
+	{"model", 'M', POPT_ARG_STRING, &model, True, "Select process model", "MODEL"},
+	POPT_TABLEEND
 	};
 	
 	pc = poptGetContext("smbd", argc, argv, long_options, 0);



More information about the samba-cvs mailing list