diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2015-02-26 12:24:21 +1300 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2015-03-06 17:39:58 +0100 |
| commit | 477fce1f395917616cd2eb144da8571e994382e7 (patch) | |
| tree | 6facda3b8ee1f2523dccde9725224a85fe4ffdba | |
| parent | 63dbf4388a53016a110bd02a31c46e0210eda463 (diff) | |
| download | samba-477fce1f395917616cd2eb144da8571e994382e7.tar.gz samba-477fce1f395917616cd2eb144da8571e994382e7.tar.xz samba-477fce1f395917616cd2eb144da8571e994382e7.zip | |
s4-lib/cmdline: Fix help for -P / --machine-pass: this no longer implies -k
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index ea08f8b951..59a724c6f9 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -166,7 +166,7 @@ struct poptOption popt_common_credentials4[] = { { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, 'N', "Don't ask for a password" }, { "password", 0, POPT_ARG_STRING, NULL, OPT_PASSWORD, "Password" }, { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" }, - { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" }, + { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password" }, { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" }, { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos, -k [yes|no]" }, { "krb5-ccache", 0, POPT_ARG_STRING, NULL, OPT_KRB5_CCACHE, "Credentials cache location for Kerberos" }, |