From 80b4d50603fb54011396f0d868ffc9907247d2af Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 21 May 2010 15:04:36 +1000 Subject: Revert "Make -k a simple non-bool option." This reverts commit 2bbf055dbb15ea99b80ae66adc906ad5494a3999. This change broke 'make test', because the current syntax is deliberate and an integral part of how Samba4 uses Kerberos. If a change like this is to be implemented, then careful review of all our test scripts must be taken first, and then new options such as --dont-use-kerberos, --may-use-kerberos and --must-use-kerberos should be added. Andrew Bartlett --- source4/lib/cmdline/popt_credentials.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source4/lib/cmdline') diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 384024fd8b..80f71eb417 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -103,6 +103,15 @@ static void popt_common_credentials_callback(poptContext con, case OPT_KERBEROS: { bool use_kerberos = true; + /* Force us to only use kerberos */ + if (arg) { + if (!set_boolean(arg, &use_kerberos)) { + fprintf(stderr, "Error parsing -k %s\n", arg); + exit(1); + break; + } + } + cli_credentials_set_kerberos_state(cmdline_credentials, use_kerberos ? CRED_MUST_USE_KERBEROS -- cgit