diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-14 20:00:32 +0200 |
| commit | 18f8f5d6561d50b9179541ea24e03a5a807a2a2a (patch) | |
| tree | 4759b1bc65e703213178d7ab4ef7c1a80e713161 /source4/setup/setpassword | |
| parent | a15b6f1606e1c761c2c4037b734137e97f00489f (diff) | |
| parent | 68a2c547d00d7a8d0c15744172489d9d010c31a3 (diff) | |
| download | samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.gz samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.tar.bz2 samba-18f8f5d6561d50b9179541ea24e03a5a807a2a2a.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake4
(This used to be commit 1ef3830bb0d6e91e3b00e880784ca0741d9b4d49)
Diffstat (limited to 'source4/setup/setpassword')
| -rw-r--r-- | source4/setup/setpassword | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/setup/setpassword b/source4/setup/setpassword index 31b2f73a25..977a6a5ee8 100644 --- a/source4/setup/setpassword +++ b/source4/setup/setpassword @@ -36,7 +36,7 @@ if len(args) == 0: parser.print_usage() sys.exit(1) -password = opts.password; +password = opts.newpassword; if password is None: password = getpass("New Password: ") @@ -47,12 +47,12 @@ if filter is None: if username is None: print "Either username or --filter must be specified" - filter = "(&(objectclass=user)(samAccountName=" + username + "))" + filter = "(&(objectclass=user)(samAccountName=%s))" % (username) -creds = credopts.get_credentials() - lp = sambaopts.get_loadparm() +creds = credopts.get_credentials(lp) + samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), credentials=creds, lp=lp) samdb.setpassword(filter, password) |