From 3cbcaa139ca490b1b457f6a623f1a3680cae9a04 Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Tue, 8 Sep 2009 02:34:30 -0500 Subject: s4:pwsettings: Add 'default' option for password complexity. --- source4/setup/pwsettings | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/setup') 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 ( | 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": -- cgit