summaryrefslogtreecommitdiff
path: root/source4/setup/pwsettings
diff options
context:
space:
mode:
authorAndrew Kroeger <andrew@id10ts.net>2009-09-08 02:34:30 -0500
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-10 01:09:55 +0200
commit3cbcaa139ca490b1b457f6a623f1a3680cae9a04 (patch)
tree521b8c6cf7ed7498f12dd434f49b79b3e528b216 /source4/setup/pwsettings
parent4b68cfe15dcb62930ddda8c43d5d52deaa4d6501 (diff)
downloadsamba-3cbcaa139ca490b1b457f6a623f1a3680cae9a04.tar.gz
samba-3cbcaa139ca490b1b457f6a623f1a3680cae9a04.tar.bz2
samba-3cbcaa139ca490b1b457f6a623f1a3680cae9a04.zip
s4:pwsettings: Add 'default' option for password complexity.
Diffstat (limited to 'source4/setup/pwsettings')
-rwxr-xr-xsource4/setup/pwsettings4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index 7206d7116b..44e12d0a98 100755
--- a/source4/setup/pwsettings
+++ b/source4/setup/pwsettings
@@ -31,7 +31,7 @@ parser.add_option_group(credopts)
parser.add_option("--quiet", help="Be quiet", action="store_true")
parser.add_option("-H", help="LDB URL for database or target server", type=str)
parser.add_option("--complexity",
- help="The password complexity (on | off). Default is 'on'", type=str)
+ help="The password complexity (on | off | default). Default is 'on'", type=str)
parser.add_option("--history-length",
help="The password history length (<integer> | default)", type=str)
parser.add_option("--min-pwd-length",
@@ -106,7 +106,7 @@ elif args[0] == "set":
m.dn = ldb.Dn(samdb, domain_dn)
if opts.complexity is not None:
- if opts.complexity == "on":
+ if opts.complexity == "on" or opts.complexity == "default":
pwd_props = pwd_props | DOMAIN_PASSWORD_COMPLEX
msgs.append("Password complexity activated!")
elif opts.complexity == "off":