From 41a09c3c533ab170097309e1f91314eda32e4f4c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 24 Mar 2003 14:15:14 +0000 Subject: Revoke some of the popt patch from metze I applied earlier today. It added some double options and broke some parameters. (This used to be commit d5f9b0275c91512e1926504f22aaeec2d104430d) --- source3/nsswitch/wbinfo.c | 2 +- source3/nsswitch/winbindd.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/nsswitch') diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index fe11cd6528..5ec8e534aa 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -711,7 +711,7 @@ 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" }, - POPT_COMMON_SAMBA + POPT_COMMON_VERSION POPT_TABLEEND }; diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c index cd72a4f572..0f34924e9d 100644 --- a/source3/nsswitch/winbindd.c +++ b/source3/nsswitch/winbindd.c @@ -820,6 +820,7 @@ int main(int argc, char **argv) { "dual-daemon", 'B', POPT_ARG_VAL, &opt_dual_daemon, True, "Dual daemon mode" }, { "no-caching", 'n', POPT_ARG_VAL, &opt_nocache, False, "Disable caching" }, POPT_COMMON_SAMBA + POPT_COMMON_CONNECTION POPT_TABLEEND }; poptContext pc; -- cgit