1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00

Revert "Make -k a simple non-bool option."

This reverts commit 2bbf055dbb.

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
This commit is contained in:
Andrew Bartlett 2010-05-21 15:04:36 +10:00
parent 91807d9dd5
commit 80b4d50603

View File

@ -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