diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-21 13:53:47 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-09-21 13:53:47 +0200 |
| commit | 7373bb79d415ae1cc1336aea779e9c2a2ed028d4 (patch) | |
| tree | d9a2758ec16ac9126befe3879aecfad8c2aafd23 /source4/setup | |
| parent | 32f4afd617944153ce17ea9b4cfe23fb29fcbc68 (diff) | |
| download | samba-7373bb79d415ae1cc1336aea779e9c2a2ed028d4.tar.gz samba-7373bb79d415ae1cc1336aea779e9c2a2ed028d4.tar.bz2 samba-7373bb79d415ae1cc1336aea779e9c2a2ed028d4.zip | |
s4:samdb/tools - That should fix now the last failures
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/setexpiry | 2 | ||||
| -rwxr-xr-x | source4/setup/setpassword | 2 |
2 files changed, 3 insertions, 1 deletions
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) |