diff options
author | Jan Cholasta <jcholast@redhat.com> | 2013-07-09 10:29:21 +0000 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-07-24 10:00:03 +0200 |
commit | 693710784bb303b5c9c5088cfbf60db44f9a6321 (patch) | |
tree | 1fb67d7935d27d192d0d2f24f3f5179ec99ca818 /install | |
parent | ab2debd1ea6c9b7cf0f35f48620b2609ff0c570c (diff) | |
download | freeipa-693710784bb303b5c9c5088cfbf60db44f9a6321.tar.gz freeipa-693710784bb303b5c9c5088cfbf60db44f9a6321.tar.xz freeipa-693710784bb303b5c9c5088cfbf60db44f9a6321.zip |
Print newline after receiving EOF in installutils.read_password.
Diffstat (limited to 'install')
-rwxr-xr-x | install/tools/ipa-ca-install | 2 | ||||
-rwxr-xr-x | install/tools/ipa-compat-manage | 2 | ||||
-rwxr-xr-x | install/tools/ipa-csreplica-manage | 2 | ||||
-rwxr-xr-x | install/tools/ipa-dns-install | 2 | ||||
-rwxr-xr-x | install/tools/ipa-managed-entries | 2 | ||||
-rwxr-xr-x | install/tools/ipa-nis-manage | 2 | ||||
-rwxr-xr-x | install/tools/ipa-replica-conncheck | 2 | ||||
-rwxr-xr-x | install/tools/ipa-replica-install | 2 | ||||
-rwxr-xr-x | install/tools/ipa-replica-manage | 2 | ||||
-rwxr-xr-x | install/tools/ipa-server-certinstall | 2 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 6 |
11 files changed, 13 insertions, 13 deletions
diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 1fd59ecde..636f63da3 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -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: diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 87fa47fe0..7061a3e5b 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -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() diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 4e11ffdef..ce027be12 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -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 diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 47bc31b47..275e699eb 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -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 diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index 5bf3ad64b..2cf37e203 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -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: diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index a35e19f97..71c0761c6 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -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") diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 3b0b1d0e4..583b5d5e7 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -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='' diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index c013c2984..79f8a7ab4 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -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) diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 2fb32fa2a..e2bd38e9b 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -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 diff --git a/install/tools/ipa-server-certinstall b/install/tools/ipa-server-certinstall index bc4dde272..5b498b1b8 100755 --- a/install/tools/ipa-server-certinstall +++ b/install/tools/ipa-server-certinstall @@ -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") diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 4ba6f0e7e..672369c54 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -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 |