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