From d2b483cbb3ca15a68115cf32cfaf89572259914e Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Wed, 8 Jun 2011 14:39:50 +0200
Subject: Fix directory manager password validation in ipa-nis-manage.

ticket 1283, 1284
---
 ipaserver/install/installutils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ipaserver')

diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py
index 8d93a60b3..f5a862599 100644
--- a/ipaserver/install/installutils.py
+++ b/ipaserver/install/installutils.py
@@ -288,15 +288,18 @@ def get_password(prompt):
     else:
         return sys.stdin.readline().rstrip()
 
-def read_password(user, confirm=True, validate=True):
+def read_password(user, confirm=True, validate=True, retry=True):
     correct = False
     pwd = ""
     while not correct:
+        if not retry:
+            correct = True
         pwd = get_password(user + " password: ")
         if not pwd:
             continue
         if validate and len(pwd) < 8:
             print "Password must be at least 8 characters long"
+            pwd = ""
             continue
         if not confirm:
             correct = True
@@ -305,6 +308,7 @@ def read_password(user, confirm=True, validate=True):
         if pwd != pwd_confirm:
             print "Password mismatch!"
             print ""
+            pwd = ""
         else:
             correct = True
     print ""
-- 
cgit