Branch '389-ds-base-1.3.5' - ldap/admin
by Mark Reynolds
ldap/admin/src/scripts/repl-monitor.pl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit cf5683ae112528597af70a4e06cfb51e8e0c3c74
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Sep 1 12:54:08 2016 -0400
Ticket 48957 - Update repl-monitor to handle new status messages
Bug Description: The replication agreement status messages have changed,
and the repl-monitor script was not updated to reflect
these changes. This lead to the html report incorrectly
color coding a successfull status.
Fix Description: Update the script to ignore "Error (0)"
https://fedorahosted.org/389/ticket/48957
Reviewed by: mreynolds (one line commit rule)
(cherry picked from commit 32ee33b2222a9bbc0657ceb912ca3fa74ee27dcc)
diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in
index aa7ab1e..a3efa8e 100755
--- a/ldap/admin/src/scripts/repl-monitor.pl.in
+++ b/ldap/admin/src/scripts/repl-monitor.pl.in
@@ -877,7 +877,7 @@ sub print_consumers
}
my $redfontstart = "";
my $redfontend = "";
- if ($status =~ /error/i) {
+ if ($status !~ /Error \(0\)/i) {
$redfontstart = "<font color='red'>";
$redfontend = "</font>";
}
7 years, 7 months
ldap/admin
by Mark Reynolds
ldap/admin/src/scripts/repl-monitor.pl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 32ee33b2222a9bbc0657ceb912ca3fa74ee27dcc
Author: Mark Reynolds <mreynolds(a)redhat.com>
Date: Thu Sep 1 12:54:08 2016 -0400
Ticket 48957 - Update repl-monitor to handle new status messages
Bug Description: The replication agreement status messages have changed,
and the repl-monitor script was not updated to reflect
these changes. This lead to the html report incorrectly
color coding a successfull status.
Fix Description: Update the script to ignore "Error (0)"
https://fedorahosted.org/389/ticket/48957
Reviewed by: mreynolds (one line commit rule)
diff --git a/ldap/admin/src/scripts/repl-monitor.pl.in b/ldap/admin/src/scripts/repl-monitor.pl.in
index aa7ab1e..a3efa8e 100755
--- a/ldap/admin/src/scripts/repl-monitor.pl.in
+++ b/ldap/admin/src/scripts/repl-monitor.pl.in
@@ -877,7 +877,7 @@ sub print_consumers
}
my $redfontstart = "";
my $redfontend = "";
- if ($status =~ /error/i) {
+ if ($status !~ /Error \(0\)/i) {
$redfontstart = "<font color='red'>";
$redfontend = "</font>";
}
7 years, 7 months
ldap/servers
by Noriko Hosoi
ldap/servers/slapd/tools/dbscan.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 590799f9b6cc8a7ef6445d70fe0567b0f2a6523b
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Aug 31 17:05:28 2016 -0700
Ticket 48805 - Sign comparison checks.
Description: commit 3e7d6d62f3b2889d0250cb0a3892982e42ada878
introduced a compiler warnng in dbscan.c.
- warning: format ���%d��� expects argument of type ���int���, but argument 2
has type ���size_t {aka long unsigned int}���
Reviewed by nhosoi (one line commit rule)
diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index 1765549..0a7f85e 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -1069,8 +1069,7 @@ static void usage(char *argv0)
printf(" index file options:\n");
printf(" -k <key> lookup only a specific key\n");
printf(" -l <size> max length of dumped id list\n");
- printf(" (default %d; 40 bytes <= size <= 1048576 bytes)\n",
- MAX_BUFFER);
+ printf(" (default %lu; 40 bytes <= size <= 1048576 bytes)\n", MAX_BUFFER);
printf(" -G <n> only display index entries with more than <n> ids\n");
printf(" -n display ID list lengths\n");
printf(" -r display the conents of ID list\n");
7 years, 7 months