summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-10-12 12:02:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:59:50 -0500
commitf2657b2cb16514d22f01c8909292e7c81c6847e5 (patch)
tree5561386110a51cc2f346878ad58dc9e94a48f3dc
parent59d3259171c04f86ea94909493e173fec147d9ae (diff)
downloadsamba-f2657b2cb16514d22f01c8909292e7c81c6847e5.tar.gz
samba-f2657b2cb16514d22f01c8909292e7c81c6847e5.tar.bz2
samba-f2657b2cb16514d22f01c8909292e7c81c6847e5.zip
r2937: Make sure all memory is initialized
(This used to be commit edf28c42f3c9b41c82a4f642ddae23efbb12c944)
-rw-r--r--source4/smbd/server.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index d25339bfc1..40ec69c3b9 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -44,14 +44,14 @@ static int binary_smbd_main(int argc,const char *argv[])
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);