IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Print newline after receiving EOF in installutils.read_password.

Browse Source
This commit is contained in:
Jan Cholasta
2013-07-09 10:29:21 +00:00
committed by Martin Kosek
parent ab2debd1ea
commit 693710784b
12 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/tools/ipa-ca-install
View File

@@ -125,7 +125,7 @@ def main():
except KeyboardInterrupt:
sys.exit(0)
if dirman_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
if not options.admin_password and not options.skip_conncheck and \
options.unattended:

2
install/tools/ipa-compat-manage
View File

@@ -98,7 +98,7 @@ def main():
else:
dirman_password = get_dirman_password()
if dirman_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
api.bootstrap(context='cli', debug=options.debug)
api.finalize()

2
install/tools/ipa-csreplica-manage
View File

@@ -401,7 +401,7 @@ def main():
dirman_passwd = installutils.read_password("Directory Manager", confirm=False,
validate=False, retry=False)
if dirman_passwd is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
options.dirman_passwd = dirman_passwd

2
install/tools/ipa-dns-install
View File

@@ -142,7 +142,7 @@ def main():
dm_password = options.dm_password or read_password("Directory Manager",
confirm=False, validate=False)
if dm_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
bind = bindinstance.BindInstance(fstore, dm_password)
# try the connection

2
install/tools/ipa-managed-entries
View File

@@ -95,7 +95,7 @@ def main():
except errors.ACIError:
dirman_password = get_dirman_password()
if dirman_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
try:
conn.do_simple_bind(bindpw=dirman_password)
except errors.ACIError:

2
install/tools/ipa-nis-manage
View File

@@ -108,7 +108,7 @@ def main():
else:
dirman_password = get_dirman_password()
if dirman_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
if not dirman_password:
sys.exit("No password supplied")

2
install/tools/ipa-replica-conncheck
View File

@@ -340,7 +340,7 @@ def main():
password = installutils.read_password(principal, confirm=False,
validate=False, retry=False)
if password is None:
sys.exit("\nPrincipal password required")
sys.exit("Principal password required")
stderr=''

2
install/tools/ipa-replica-install
View File

@@ -480,7 +480,7 @@ def main():
except KeyboardInterrupt:
sys.exit(0)
if dirman_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
try:
top_dir, dir = expand_replica_info(filename, dirman_password)

2
install/tools/ipa-replica-manage
View File

@@ -1178,7 +1178,7 @@ def main():
dirman_passwd = installutils.read_password("Directory Manager",
confirm=False, validate=False, retry=False)
if dirman_passwd is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
options.dirman_passwd = dirman_passwd

2
install/tools/ipa-server-certinstall
View File

@@ -141,7 +141,7 @@ def main():
dm_password = installutils.read_password("Directory Manager",
confirm=False, validate=False, retry=False)
if dm_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
realm = get_realm_name()
dirname = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm))
fd = open(dirname + "/pwdfile.txt")

6
install/tools/ipa-server-install
View File

@@ -666,7 +666,7 @@ def main():
else:
dm_password = read_password("Directory Manager", confirm=False)
if dm_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
try:
options._update_loose(read_cache(dm_password))
except Exception, e:
@@ -886,7 +886,7 @@ def main():
dm_password = read_dm_password()
if dm_password is None:
sys.exit("\nDirectory Manager password required")
sys.exit("Directory Manager password required")
else:
dm_password = options.dm_password
@@ -898,7 +898,7 @@ def main():
if not options.admin_password:
admin_password = read_admin_password()
if admin_password is None:
sys.exit("\nIPA admin password required")
sys.exit("IPA admin password required")
else:
admin_password = options.admin_password

3
ipaserver/install/installutils.py
View File

@@ -291,7 +291,8 @@ def read_password(user, confirm=True, validate=True, retry=True, validator=_read
correct = True
except EOFError:
return None
print ""
finally:
print ""
return pwd
def update_file(filename, orig, subst):