[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  03f2200... Add comments to usage error message for -k to make it obvious what this needs.
      from  8c9ea2b... Set SMB2 max read/write/trans sizes to Win7 compatible - 1Mb.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 03f22005f9692feee150cf51c70d09ce2100ae02
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 21 10:35:22 2010 -0700

    Add comments to usage error message for -k to make it obvious what this needs.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source4/lib/cmdline/popt_credentials.c |    5 +++--
 1 files changed, 3 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 80f71eb..1f61d64 100644
--- a/source4/lib/cmdline/popt_credentials.c
+++ b/source4/lib/cmdline/popt_credentials.c
@@ -106,7 +106,8 @@ static void popt_common_credentials_callback(poptContext con,
 		/* Force us to only use kerberos */
 		if (arg) {
 			if (!set_boolean(arg, &use_kerberos)) {
-				fprintf(stderr, "Error parsing -k %s\n", arg);
+				fprintf(stderr, "Error parsing -k %s. Should be "
+					"-k = [yes|no]\n", arg);
 				exit(1);
 				break;
 			}
@@ -159,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" },
+	{ "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