summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/getopt.py
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-01-25 23:16:34 +1100
committerAndrew Tridgell <tridge@samba.org>2008-01-25 23:16:34 +1100
commit98d2b00dbe08b1303858be5f85704fa4bd1e7233 (patch)
tree565407437cc94938e7a8988eaa2d92f6dd9b1261 /source4/scripting/python/samba/getopt.py
parent8ef7ddbf895d0126f578fcc46d2cb292addddf2b (diff)
parent21f5f4d4409e5a7076194639570f11ec32cf3257 (diff)
downloadsamba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.tar.gz
samba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.tar.xz
samba-98d2b00dbe08b1303858be5f85704fa4bd1e7233.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 1e042908992cdf3149ffc24472c7f0b1c3f9edef)
Diffstat (limited to 'source4/scripting/python/samba/getopt.py')
-rw-r--r--source4/scripting/python/samba/getopt.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/source4/scripting/python/samba/getopt.py b/source4/scripting/python/samba/getopt.py
index dfcf2c457e..088a5acf6f 100644
--- a/source4/scripting/python/samba/getopt.py
+++ b/source4/scripting/python/samba/getopt.py
@@ -50,6 +50,7 @@ class VersionOptions(optparse.OptionGroup):
class CredentialsOptions(optparse.OptionGroup):
def __init__(self, parser):
+ self.no_pass = False
optparse.OptionGroup.__init__(self, parser, "Credentials Options")
self.add_option("--simple-bind-dn", metavar="DN", action="callback",
callback=self._set_simple_bind_dn, type=str,
@@ -62,6 +63,8 @@ class CredentialsOptions(optparse.OptionGroup):
self.add_option("-W", "--workgroup", metavar="WORKGROUP",
action="callback", type=str,
help="Workgroup", callback=self._parse_workgroup)
+ self.add_option("-N", "--no-pass", action="store_true",
+ help="Don't ask for a password")
self.creds = Credentials()
def _parse_username(self, option, opt_str, arg, parser):
@@ -77,4 +80,7 @@ class CredentialsOptions(optparse.OptionGroup):
self.creds.set_bind_dn(arg)
def get_credentials(self):
+ self.creds.guess()
+ if not self.no_pass:
+ self.creds.set_cmdline_callbacks()
return self.creds