From eb971614e538a16852b3cbc3677fb06eb57e6a83 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 11 Oct 2011 23:56:15 +0200 Subject: samba.getopt: Allow --kerberos=auto, and fix exception name if an unknown value is specified. Autobuild-User: Jelmer Vernooij Autobuild-Date: Wed Oct 12 02:12:21 CEST 2011 on sn-devel-104 --- source4/scripting/python/samba/getopt.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4') diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py index 01e9f87e76..1b30d2fade 100644 --- a/source4/scripting/python/samba/getopt.py +++ b/source4/scripting/python/samba/getopt.py @@ -25,6 +25,7 @@ import optparse import os from samba.credentials import ( Credentials, + AUTO_USE_KERBEROS, DONT_USE_KERBEROS, MUST_USE_KERBEROS, ) @@ -150,8 +151,10 @@ class CredentialsOptions(optparse.OptionGroup): self.creds.set_kerberos_state(MUST_USE_KERBEROS) elif arg.lower() in ["no", 'false', '0']: self.creds.set_kerberos_state(DONT_USE_KERBEROS) + elif arg.lower() in ["auto"]: + self.creds.set_kerberos_state(AUTO_USE_KERBEROS) else: - raise optparse.BadOptionErr("invalid kerberos option: %s" % arg) + raise optparse.BadOptionError("invalid kerberos option: %s" % arg) def _set_simple_bind_dn(self, option, opt_str, arg, parser): self.creds.set_bind_dn(arg) -- cgit