s4:samdb/tools - That should fix now the last failures

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 239dd6a6ea4f44397da2b4d70c078f97f3ce6036..39cf1d6c406ed87c7cd0bc7fda04e16a8140a061 100644 (file)
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -202,8 +202,8 @@ userPassword:: %s
         self.transaction_start()
         try:
             res = self.search(base=self.domain_dn(), scope=ldb.SCOPE_SUBTREE,
-                              expression=filter,
-                              attrs=["userAccountControl", "accountExpires"])
+                          expression=filter,
+                          attrs=["userAccountControl", "accountExpires"])
             assert(len(res) == 1)
             user_dn = res[0].dn
 

diff --git a/source4/setup/setexpiry b/source4/setup/setexpiry
index 57c46f4dff74cfe7b5600d8aa9aa0c64ed036d5c..2740326f2b493bef89434566e30534e812356e91 100755 (executable)
--- a/source4/setup/setexpiry
+++ b/source4/setup/setexpiry
@@ -44,6 +44,8 @@ parser.add_option("--noexpiry", help="Password does never expire", action="store
 
 opts, args = parser.parse_args()
 
+filter = opts.filter
+
 if (len(args) == 0) and (filter is None):
        print "Either the username or '--filter' must be specified!"
        parser.print_usage()

diff --git a/source4/setup/setpassword b/source4/setup/setpassword
index c150f518ad02fb1724790f89f9f0e3c5ddb2ca9b..57772be7a75c79bd1602cf35c1490b551891995a 100755 (executable)
--- a/source4/setup/setpassword
+++ b/source4/setup/setpassword
@@ -70,5 +70,5 @@ else:
 
 samdb = SamDB(url=url, session_info=system_session(), credentials=creds, lp=lp)
 
-samdb.setpassword(filter, password, force_password_change_at_next_login=opts.must_change_at_next_login)
+samdb.setpassword(filter, password, force_password_change_at_next_login_req=opts.must_change_at_next_login)