diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2003-03-24 11:25:34 +0000 |
| commit | 11e9de855ca84af8d34a5f6459f304fcfa72dca3 (patch) | |
| tree | 0eb5d0505a50136ed74a4207219c42b9d4996402 /source3/nsswitch | |
| parent | 223828642548c7e25f6189e274aa1edcdfe30c4f (diff) | |
| download | samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.gz samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.bz2 samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.zip | |
Patch from metze to generalise POPT_COMMON_SAMBA, with some minor changes
(This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/wbinfo.c | 4 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd.c | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 4f621e7008..fe11cd6528 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -711,8 +711,8 @@ int main(int argc, char **argv) { "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" }, { "get-auth-user", 0, POPT_ARG_NONE, NULL, OPT_GET_AUTH_USER, "Retrieve user and password used by winbindd (root only)", NULL }, { "ping", 'p', POPT_ARG_NONE, 0, 'p', "Ping winbindd to see if it is alive" }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, - { 0, 0, 0, 0 } + POPT_COMMON_SAMBA + POPT_TABLEEND }; /* Samba client initialisation */ diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index c9d6808316..cd72a4f572 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -814,16 +814,13 @@ int main(int argc, char **argv) static BOOL log_stdout = False; struct poptOption long_options[] = { POPT_AUTOHELP - POPT_COMMON_SAMBA - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_configfile }, { "stdout", 'S', POPT_ARG_VAL, &log_stdout, True, "Log to stdout" }, { "foreground", 'F', POPT_ARG_VAL, &Fork, False, "Daemon in foreground mode" }, { "interactive", 'i', POPT_ARG_NONE, NULL, 'i', "Interactive mode" }, { "dual-daemon", 'B', POPT_ARG_VAL, &opt_dual_daemon, True, "Dual daemon mode" }, { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" }, - - { 0, 0, 0, 0 } + POPT_COMMON_SAMBA + POPT_TABLEEND }; poptContext pc; int opt; |