s4: Correct the parameter logic of the "setpassword" script

Either the username or the filter are allowed. If both are given the filter is
going to be used due to a higher precedence.

1 files changed, 4 insertions, 7 deletions

diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index 3505adfa7e..513730d649 100755
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -52,7 +52,10 @@ def message(text):
 	if not opts.quiet:
 		print text
 
-if len(args) == 0:
+filter = opts.filter
+
+if (len(args) == 0) and (filter is None):
+	print "Either the username or '--filter' must be specified!"
 	parser.print_usage()
 	sys.exit(1)
 
@@ -60,16 +63,10 @@ password = opts.newpassword;
 if password is None:
 	password = getpass("New Password: ")
 
-filter = opts.filter
-
 if filter is None:
 	username = args[0]
-	if username is None:
-		print "Either username or --filter must be specified"
-
 	filter = "(&(objectclass=user)(samAccountName=%s))" % (username)
 
-
 lp = sambaopts.get_loadparm()
 creds = credopts.get_credentials(lp)