summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2006-05-24 04:02:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:17:11 -0500
commit90a6873b0570f2691ba8d8fd11154c856bdd4415 (patch)
treef43e5afb8ef846da4a8205966ec6ef2783660c82 /source3/smbd
parentfc72e30c8d007afa70cf90eec8a0f0cc5f5f42b0 (diff)
downloadsamba-90a6873b0570f2691ba8d8fd11154c856bdd4415.tar.gz
samba-90a6873b0570f2691ba8d8fd11154c856bdd4415.tar.bz2
samba-90a6873b0570f2691ba8d8fd11154c856bdd4415.zip
r15848: Introduce commandline options to set the remainder of the parameters in
dynconfig.c. This is mainly useful for test harness scripts, hence the lack of short options. (This used to be commit bf3b71c84595608d71e0f15a6158adacb295518e)
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/server.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index d16579f24a..2bfeae9f54 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -744,16 +744,17 @@ void build_options(BOOL screen);
poptContext pc;
struct poptOption long_options[] = {
- POPT_AUTOHELP
+ 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)" },
- {"no-process-group", 0, POPT_ARG_VAL, &no_process_group, True, "Don't create a new process group" },
+ {"foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools, etc.)" },
+ {"no-process-group", '\0', POPT_ARG_VAL, &no_process_group, True, "Don't create a new process group" },
{"log-stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" },
{"build-options", 'b', POPT_ARG_NONE, NULL, 'b', "Print build options" },
{"port", 'p', POPT_ARG_STRING, &ports, 0, "Listen on the specified ports"},
POPT_COMMON_SAMBA
- { NULL }
+ POPT_COMMON_DYNCONFIG
+ POPT_TABLEEND
};
load_case_tables();