sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-18 00:59:12 +03:00
Code Activity

samba-tool: Improve getopt.py error handling

Browse Source 
Modified code to handle -k and --kerberos options to:
1. Throw the correct exception
2. On error, display the correct user's specified option
This commit is contained in:
Giampaolo Lauria
2011-10-17 15:34:47 -04:00
committed by Jelmer Vernooij
parent 20f2034f38
commit eb388cddac
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source4/scripting/python/samba/getopt.py
View File

@ -111,7 +111,7 @@ class VersionOptions(optparse.OptionGroup):
sys.exit(0)
def parse_kerberos_arg(arg):
def parse_kerberos_arg(arg, opt_str):
if arg.lower() in ["yes", 'true', '1']:
return MUST_USE_KERBEROS
elif arg.lower() in ["no", 'false', '0']:
@ -119,7 +119,8 @@ def parse_kerberos_arg(arg):
elif arg.lower() in ["auto"]:
return AUTO_USE_KERBEROS
else:
raise optparse.BadOptionError("invalid kerberos option: %s" % arg)
raise optparse.OptionValueError("invalid %s option value: %s" %
(opt_str, arg))
class CredentialsOptions(optparse.OptionGroup):
@ -165,7 +166,7 @@ class CredentialsOptions(optparse.OptionGroup):
self.ipaddress = arg
def _set_kerberos(self, option, opt_str, arg, parser):
self.creds.set_kerberos_state(parse_kerberos_arg(arg))
self.creds.set_kerberos_state(parse_kerberos_arg(arg, opt_str))
def _set_simple_bind_dn(self, option, opt_str, arg, parser):
self.creds.set_bind_dn(arg)
@ -229,7 +230,7 @@ class CredentialsOptionsDouble(CredentialsOptions):
self.no_pass2 = False
def _set_kerberos2(self, option, opt_str, arg, parser):
self.creds2.set_kerberos_state(parse_kerberos_arg(arg))
self.creds2.set_kerberos_state(parse_kerberos_arg(arg, opt_str))
def _set_simple_bind_dn2(self, option, opt_str, arg, parser):
self.creds2.set_bind_dn(arg)