From 11e9de855ca84af8d34a5f6459f304fcfa72dca3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 24 Mar 2003 11:25:34 +0000 Subject: Patch from metze to generalise POPT_COMMON_SAMBA, with some minor changes (This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae) --- source3/wrepld/server.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3/wrepld') diff --git a/source3/wrepld/server.c b/source3/wrepld/server.c index 5203d33745..be9d86952d 100644 --- a/source3/wrepld/server.c +++ b/source3/wrepld/server.c @@ -510,17 +510,13 @@ static void process(void) static BOOL log_stdout = False; struct poptOption long_options[] = { POPT_AUTOHELP - POPT_COMMON_SAMBA - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_socket_options }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_log_base }, { "daemon", 'D', POPT_ARG_VAL, &is_daemon, True, "Become a daemon (default)" }, { "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Run daemon in foreground (for daemontools, etc)" }, { "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" }, { "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Run interactive (not a daemon)" }, { "port", 'p', POPT_ARG_INT, &wins_port, 'p', "Listen on the specified port" }, - { 0, 0, 0, 0 } + POPT_COMMON_SAMBA + POPT_TABLEEND }; int opt; poptContext pc; -- cgit