[PATCH] s4:pwsettings: Add 'default' option for password complexity.

[Andrew Kroeger]

---
 source4/setup/pwsettings |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source4/setup/pwsettings b/source4/setup/pwsettings
index 7206d71..44e12d0 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":
-- 
1.6.0.6


--------------000702080806020802060003
Content-Type: text/plain;
 name="0006-s4-pwsettings-Show-default-values-in-help-messages.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename*0="0006-s4-pwsettings-Show-default-values-in-help-messages.patc";
 filename*1="h"