admserv/newinst/src/register-ds-admin.pl.in | 11 ++++++-----
admserv/newinst/src/register-ds-admin.res.in | 2 ++
2 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit 6b0e7456d2a8b605e737a62010c0bf40d03441f1
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue May 26 23:05:11 2015 -0700
Ticket #48186 - register-ds-admin.pl script prints clear text password in the
terminal
Description: Call reg_get_passwd for the remote DS password, as well.
https://fedorahosted.org/389/ticket/48186
Reviewed by mreynolds(a)redhat.com (Thank you, Mark!!)
diff --git a/admserv/newinst/src/register-ds-admin.pl.in
b/admserv/newinst/src/register-ds-admin.pl.in
index aebe0ba..04e936a 100644
--- a/admserv/newinst/src/register-ds-admin.pl.in
+++ b/admserv/newinst/src/register-ds-admin.pl.in
@@ -62,8 +62,12 @@ sub reg_get_passwd
my $key = shift;
my $value0 = shift;
my $value1 = shift;
+ my $value2 = shift;
-
print("\n==============================================================================\n");
+ if ( ! $value2 )
+ {
+
print("\n==============================================================================\n");
+ }
if ( $value1 )
{
$setup->msg(0, $key, $value0, $value1);
@@ -827,10 +831,7 @@ if ($silent eq "no")
chomp($remote_binddn = <>);
}
- $setup->msg(0, 'remote_prompt', "bind password");
- while($remote_bindpw eq ""){
- chomp($remote_bindpw = <>);
- }
+ $remote_bindpw = reg_get_passwd($setup, 'remote_prompt_bind_password',
"", 0, 1);
$setup->msg(0, 'remote_conn_use_ssl');
chomp($local_certdir = <>);
diff --git a/admserv/newinst/src/register-ds-admin.res.in
b/admserv/newinst/src/register-ds-admin.res.in
index 99cb3e3..f7c0e67 100644
--- a/admserv/newinst/src/register-ds-admin.res.in
+++ b/admserv/newinst/src/register-ds-admin.res.in
@@ -62,6 +62,8 @@ remote_register_direction = Register local servers to
remote_prompt = Enter Remote %s:
+remote_prompt_bind_password = Enter Remote bind password:
+
remote_conn_use_ssl = If using SSL, enter certificate db directory:
remote_register_completed = Successfully registered host '%s' with the
configuration server on '%s'.\n