ldap/admin/src/scripts/repl-monitor.pl.in | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 44c4221d5f6ec3c7e8ca5d3452b24870f7cccf62
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Aug 7 12:18:57 2014 -0400
Ticket 47862 - repl-monitor fails to convert "*" to default values
Bug Description: When specifying the "connection" parameters, you are
allowed to use asterisks to signify default values.
This was not properly checked in the script, and the
the default values were not applied.
Fix Description: Properly check for "*" for the bind dn, bind password,
and certdir.
https://fedorahosted.org/389/ticket/47862
Reviewed by: nhosoi(Thanks!)
(cherry picked from commit a498525a76aaafc7d2979f577d4e7a93a3158d0b)
Conflicts:
ldap/admin/src/scripts/repl-monitor.pl.in
diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in
b/ldap/admin/src/scripts/repl-monitor.pl.in
index 9107c2d..4cb0bef 100755
--- a/ldap/admin/src/scripts/repl-monitor.pl.in
+++ b/ldap/admin/src/scripts/repl-monitor.pl.in
@@ -1008,7 +1008,10 @@ sub add_server
$hostnode = $1 if $host =~ /^(.+?)\./;
# new host:port
- if (!$binddn || $binddn eq "" || !$bindpwd || $bindpwd eq "" ||
!$bindcert || $bindcert eq "") {
+ if (!$binddn || $binddn eq "" || $binddn eq "*" ||
+ !$bindpwd || $bindpwd eq "" || $bindpwd eq "*" ||
+ !$bindcert || $bindcert eq "" || $bindcert eq "*" )
+ {
#
# Look up connection parameter in the order of
# host:port
@@ -1043,8 +1046,8 @@ sub add_server
$binddn = $d;
}
}
- if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd
eq ""))){
- $bindpwd = passwdPrompt($h, $p);
+ if($prompt eq "yes" && ($w eq "" || (!$bindpwd || $bindpwd
eq "" || $bindpwd eq "*"))){
+ $bindpwd = passwdPrompt($h, $p);
} elsif ($passwd ne ""){
$bindpwd = $passwd;
} else {