The branch, master has been updated
via f576cc5... Doh! If you're going to give advice in "useage", make
sure it's correct.
from 03f2200... Add comments to usage error message for -k to make it
obvious what this needs.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f576cc5410a9074a769ca1fbf786a142449e6058
Author: Jeremy Allison <j...@samba.org>
Date: Fri May 21 11:40:54 2010 -0700
Doh! If you're going to give advice in "useage", make sure it's correct.
Jeremy.
-----------------------------------------------------------------------
Summary of changes:
source4/lib/cmdline/popt_credentials.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/cmdline/popt_credentials.c
b/source4/lib/cmdline/popt_credentials.c
index 1f61d64..1776fb2 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -107,7 +107,7 @@ static void popt_common_credentials_callback(poptContext
con,
if (arg) {
if (!set_boolean(arg, &use_kerberos)) {
fprintf(stderr, "Error parsing -k %s. Should be
"
- "-k = [yes|no]\n", arg);
+ "-k [yes|no]\n", arg);
exit(1);
break;
}
@@ -160,7 +160,7 @@ struct poptOption popt_common_credentials[] = {
{ "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)" },
{ "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]" },
+ { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos,
-k [yes|no]" },
{ "sign", 'S', POPT_ARG_NONE, NULL, OPT_SIGN, "Sign connection to
prevent modification in transit" },
{ "encrypt", 'e', POPT_ARG_NONE, NULL, OPT_ENCRYPT, "Encrypt connection
for privacy" },
{ NULL }
--
Samba Shared Repository
