diff options
| -rw-r--r-- | source4/scripting/python/samba/samdb.py | 4 | ||||
| -rwxr-xr-x | source4/setup/setexpiry | 2 | ||||
| -rwxr-xr-x | source4/setup/setpassword | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 239dd6a6ea..39cf1d6c40 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 57c46f4dff..2740326f2b 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 c150f518ad..57772be7a7 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) |