From: Björn Baumbach <bb@sernet.de>
Date: Mon, 19 Mar 2012 13:48:43 +0000 (+0100)
Subject: s4-samba-tool: add password verification in change user pass
X-Git-Tag: tdb-1.2.10~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=217d04138b9ba13ca30ea9d826e6b515d9e593dc;p=thirdparty%2Fsamba.git

s4-samba-tool: add password verification in change user pass

Signed-off-by: Michael Adam <obnox@samba.org>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Mar 21 17:43:35 CET 2012 on sn-devel-104
---

diff --git a/source4/scripting/python/samba/netcmd/user.py b/source4/scripting/python/samba/netcmd/user.py
index b56d0398ce4..6ba61500043 100644
--- a/source4/scripting/python/samba/netcmd/user.py
+++ b/source4/scripting/python/samba/netcmd/user.py
@@ -442,10 +442,14 @@ class cmd_user_password(Command):
         net = Net(creds, lp, server=credopts.ipaddress)
 
         password = newpassword
-        while 1:
+        while True:
             if password is not None and password is not '':
                 break
             password = getpass("New Password: ")
+            passwordverify = getpass("Retype Password: ")
+            if not password == passwordverify:
+                password = None
+                self.outf.write("Sorry, passwords do not match.\n")
 
         try:
             net.change_password(password)