summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-21 15:04:36 +1000
committerAndrew Bartlett <abartlet@samba.org>2010-05-21 15:04:36 +1000
commit80b4d50603fb54011396f0d868ffc9907247d2af (patch)
treef5e4b7f20e9f2cef47bbeb96086f185b26b9e66a /source4
parent91807d9dd59b3b99250e5e52f84748710be3c360 (diff)
downloadsamba-80b4d50603fb54011396f0d868ffc9907247d2af.tar.gz
samba-80b4d50603fb54011396f0d868ffc9907247d2af.tar.bz2
samba-80b4d50603fb54011396f0d868ffc9907247d2af.zip
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
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/cmdline/popt_credentials.c9
1 files changed, 9 insertions, 0 deletions
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