summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2003-06-18 14:20:23 +0000
committerJim McDonough <jmcd@samba.org>2003-06-18 14:20:23 +0000
commitc3641282120eb73396219c7a316d07a0b2aa25ad (patch)
tree92df18ad0daa5d68f442b23399c5dfe2a76d04a5
parent4a33bc9c73f213c21b4eefa1acd807a9894bc1ab (diff)
downloadsamba-c3641282120eb73396219c7a316d07a0b2aa25ad.tar.gz
samba-c3641282120eb73396219c7a316d07a0b2aa25ad.tar.bz2
samba-c3641282120eb73396219c7a316d07a0b2aa25ad.zip
Remove the -A option of wbinfo, leaving only the long version,
--set-auth-user. There was enough confusion, as in bug #158, when a user accidentally typed -A instead of -a, and would get themselves stuck with a non-working winbind. I've made the changes to docs/docbook/manpages/wbinfo.xml, but I'm not sure what to do beyond that. Is checking that in enough? (This used to be commit 70fe85e4698ce2c26372b050417986bf4a96680b)
-rw-r--r--source3/nsswitch/wbinfo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index 61c54b3738..75e1d825ce 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/nsswitch/wbinfo.c
@@ -710,7 +710,7 @@ int main(int argc, char **argv)
{ "sequence", 0, POPT_ARG_NONE, 0, OPT_SEQUENCE, "Show sequence numbers of all domains" },
{ "user-groups", 'r', POPT_ARG_STRING, &string_arg, 'r', "Get user groups", "USER" },
{ "authenticate", 'a', POPT_ARG_STRING, &string_arg, 'a', "authenticate user", "user%password" },
- { "set-auth-user", 'A', POPT_ARG_STRING, &string_arg, OPT_SET_AUTH_USER, "Store user and password used by winbindd (root only)", "user%password" },
+ { "set-auth-user", 0, 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_VERSION