[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-598-g7373bb7

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  7373bb79d415ae1cc1336aea779e9c2a2ed028d4 (commit)
      from  32f4afd617944153ce17ea9b4cfe23fb29fcbc68 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7373bb79d415ae1cc1336aea779e9c2a2ed028d4
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Mon Sep 21 13:53:47 2009 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 source4/scripting/python/samba/samdb.py |    4 ++--
 source4/setup/setexpiry                 |    2 ++
 source4/setup/setpassword               |    2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 239dd6a..39cf1d6 100644
--- 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 57c46f4..2740326 100755
--- 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 c150f51..57772be 100755
--- 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)
 


-- 
Samba Shared Repository