Branch '389-ds-base-1.3.1' - ldap/admin
by Noriko Hosoi
ldap/admin/src/scripts/80upgradednformat.pl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 2e3a1c293ad7ca37628a51793dd4e0dfc5a2f916
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Jul 2 15:21:54 2013 -0700
Ticket #47420 - An upgrade script 80upgradednformat.pl fails to handle a server instance name incuding '-'
Bug description: If a server instance name contains '-', e.g.,
slapd-TEST-SERVER, it accidentally picks up the first part of
the instance name 'TEST'.
Fix description: Replacing "split(/-/, $instancedir)" with
"split(/-/, $instancedir, 2)".
https://fedorahosted.org/389/ticket/47420
Reviewed by Rich (Thank you!!)
(cherry picked from commit 4df4aad94f05ec9f8fde32bfe71b453d31092627)
diff --git a/ldap/admin/src/scripts/80upgradednformat.pl.in b/ldap/admin/src/scripts/80upgradednformat.pl.in
index aa433e3..c566b42 100644
--- a/ldap/admin/src/scripts/80upgradednformat.pl.in
+++ b/ldap/admin/src/scripts/80upgradednformat.pl.in
@@ -86,7 +86,7 @@ sub runinst {
my $ldifdir = $config_entry->{"nsslapd-ldifdir"}[0];
my $instancedir = $config_entry->{"nsslapd-instancedir"}[0];
- my ($slapd, $serverID) = split(/-/, $instancedir);
+ my ($slapd, $serverID) = split(/-/, $instancedir, 2);
my $upgradednformat = "@sbindir@/upgradednformat -Z $serverID";
my $reindex = "@sbindir@/db2index -Z $serverID";
10 years, 9 months
ldap/admin
by Noriko Hosoi
ldap/admin/src/scripts/80upgradednformat.pl.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 4df4aad94f05ec9f8fde32bfe71b453d31092627
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Tue Jul 2 15:21:54 2013 -0700
Ticket #47420 - An upgrade script 80upgradednformat.pl fails to handle a server instance name incuding '-'
Bug description: If a server instance name contains '-', e.g.,
slapd-TEST-SERVER, it accidentally picks up the first part of
the instance name 'TEST'.
Fix description: Replacing "split(/-/, $instancedir)" with
"split(/-/, $instancedir, 2)".
https://fedorahosted.org/389/ticket/47420
Reviewed by Rich (Thank you!!)
diff --git a/ldap/admin/src/scripts/80upgradednformat.pl.in b/ldap/admin/src/scripts/80upgradednformat.pl.in
index aa433e3..c566b42 100644
--- a/ldap/admin/src/scripts/80upgradednformat.pl.in
+++ b/ldap/admin/src/scripts/80upgradednformat.pl.in
@@ -86,7 +86,7 @@ sub runinst {
my $ldifdir = $config_entry->{"nsslapd-ldifdir"}[0];
my $instancedir = $config_entry->{"nsslapd-instancedir"}[0];
- my ($slapd, $serverID) = split(/-/, $instancedir);
+ my ($slapd, $serverID) = split(/-/, $instancedir, 2);
my $upgradednformat = "@sbindir@/upgradednformat -Z $serverID";
my $reindex = "@sbindir@/db2index -Z $serverID";
10 years, 9 months
ldap/admin
by Richard Allen Megginson
ldap/admin/src/logconv.pl | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8a23f5e0af41291d28c4ce7251d9bb2e94a5994c
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Jul 2 14:38:49 2013 -0600
Ticket #47387 - improve logconv.pl performance with large access logs
https://fedorahosted.org/389/ticket/47387
Reviewed by: mreynolds (Thanks!)
Branch: master
Fix Description: Fix some additional uninitialized variable warnings
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: no
diff --git a/ldap/admin/src/logconv.pl b/ldap/admin/src/logconv.pl
index bfca678..e299b22 100755
--- a/ldap/admin/src/logconv.pl
+++ b/ldap/admin/src/logconv.pl
@@ -673,7 +673,7 @@ if ($verb eq "yes" || $usage =~ /u/){
my $notesCount = "1";
my $unindexedIp;
- for (my $n = 0; $n <= scalar(@{$notesEtime}); $n++){
+ for (my $n = 0; $n < scalar(@{$notesEtime}); $n++){
if($conn_hash->{$notesConn->[$n]} eq ""){
$unindexedIp = "?";
} else {
@@ -726,7 +726,7 @@ if ($verb eq "yes" || $usage =~ /u/){
my $notesCount = "1";
my $unindexedIp;
- for (my $n = 0; $n <= scalar(@{$notesEtime}); $n++){
+ for (my $n = 0; $n < scalar(@{$notesEtime}); $n++){
if($conn_hash->{$notesConn->[$n]} eq ""){
$unindexedIp = "?";
} else {
@@ -1821,7 +1821,7 @@ sub parseLineNormal
$con = $1;
if ($_ =~ /op= *([0-9]+)/i){ $op = $1;}
}
- for (my $i=0; $i <= $vlvCount;$i++){
+ for (my $i=0; $i < $vlvCount;$i++){
if ($vlvconn[$i] eq $con && $vlvop[$i] eq $op){ $vlvNotesACount++; $isVlvNotes="1";}
}
if($isVlvNotes == 0){
@@ -1846,7 +1846,7 @@ sub parseLineNormal
$con = $1;
if ($_ =~ /op= *([0-9]+)/i){ $op = $1;}
}
- for (my $i=0; $i <= $vlvCount;$i++){
+ for (my $i=0; $i < $vlvCount;$i++){
if ($vlvconn[$i] eq $con && $vlvop[$i] eq $op){ $vlvNotesUCount++; $isVlvNotes="1";}
}
if($isVlvNotes == 0){
10 years, 9 months
Branch '389-ds-base-1.3.0' - ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1baa10dd3c14c6cdc29aae5d114547df812b5c17
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Jul 2 14:40:00 2013 -0600
Ticket #47409 - allow setting db deadlock rejection policy
https://fedorahosted.org/389/ticket/47409
Reviewed by: nhosoi (Thanks!)
Branch: 389-ds-base-1.3.0
Fix Description: Fix coverity CID 11893 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
val is u_int32_t which is never less than 0
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter
(cherry picked from commit 989a30bb2d63ee6b9157a9eb6a3d2ff6828abc60)
(cherry picked from commit 75b9e42a6555073d902526c20a606d17fd11f967)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 44ccf78..b713f73 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1339,7 +1339,7 @@ static int ldbm_config_db_deadlock_policy_set(void *arg, void *value, char *erro
int retval = LDAP_SUCCESS;
u_int32_t val = (u_int32_t) ((uintptr_t)value);
- if ((val < DB_LOCK_NORUN) || (val > DB_LOCK_YOUNGEST)) {
+ if (val > DB_LOCK_YOUNGEST) {
PR_snprintf(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
"Error: Invalid value for %s (%d). Must be between %d and %d inclusive",
CONFIG_DB_DEADLOCK_POLICY, val, DB_LOCK_DEFAULT, DB_LOCK_YOUNGEST);
10 years, 9 months
ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 989a30bb2d63ee6b9157a9eb6a3d2ff6828abc60
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Jul 2 14:40:00 2013 -0600
Ticket #47409 - allow setting db deadlock rejection policy
https://fedorahosted.org/389/ticket/47409
Reviewed by: nhosoi (Thanks!)
Branch: master
Fix Description: Fix coverity CID 11893 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
val is u_int32_t which is never less than 0
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index c39e69b..db8928e 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1407,7 +1407,7 @@ static int ldbm_config_db_deadlock_policy_set(void *arg, void *value, char *erro
int retval = LDAP_SUCCESS;
u_int32_t val = (u_int32_t) ((uintptr_t)value);
- if ((val < DB_LOCK_NORUN) || (val > DB_LOCK_YOUNGEST)) {
+ if (val > DB_LOCK_YOUNGEST) {
PR_snprintf(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
"Error: Invalid value for %s (%d). Must be between %d and %d inclusive",
CONFIG_DB_DEADLOCK_POLICY, val, DB_LOCK_DEFAULT, DB_LOCK_YOUNGEST);
10 years, 9 months
Branch '389-ds-base-1.2.11' - ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d1aef99989c498cde20fc311b05780702efee653
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Jul 2 14:40:00 2013 -0600
Ticket #47409 - allow setting db deadlock rejection policy
https://fedorahosted.org/389/ticket/47409
Reviewed by: nhosoi (Thanks!)
Branch: 389-ds-base-1.2.11
Fix Description: Fix coverity CID 11893 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
val is u_int32_t which is never less than 0
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter
(cherry picked from commit 989a30bb2d63ee6b9157a9eb6a3d2ff6828abc60)
(cherry picked from commit 75b9e42a6555073d902526c20a606d17fd11f967)
(cherry picked from commit 1baa10dd3c14c6cdc29aae5d114547df812b5c17)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 44ccf78..b713f73 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1339,7 +1339,7 @@ static int ldbm_config_db_deadlock_policy_set(void *arg, void *value, char *erro
int retval = LDAP_SUCCESS;
u_int32_t val = (u_int32_t) ((uintptr_t)value);
- if ((val < DB_LOCK_NORUN) || (val > DB_LOCK_YOUNGEST)) {
+ if (val > DB_LOCK_YOUNGEST) {
PR_snprintf(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
"Error: Invalid value for %s (%d). Must be between %d and %d inclusive",
CONFIG_DB_DEADLOCK_POLICY, val, DB_LOCK_DEFAULT, DB_LOCK_YOUNGEST);
10 years, 9 months
Branch '389-ds-base-1.3.1' - ldap/servers
by Richard Allen Megginson
ldap/servers/slapd/back-ldbm/ldbm_config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 75b9e42a6555073d902526c20a606d17fd11f967
Author: Rich Megginson <rmeggins(a)redhat.com>
Date: Tue Jul 2 14:40:00 2013 -0600
Ticket #47409 - allow setting db deadlock rejection policy
https://fedorahosted.org/389/ticket/47409
Reviewed by: nhosoi (Thanks!)
Branch: 389-ds-base-1.3.1
Fix Description: Fix coverity CID 11893 (#1 of 1): Unsigned compared against 0 (NO_EFFECT)
val is u_int32_t which is never less than 0
Platforms tested: RHEL6 x86_64
Flag Day: no
Doc impact: yes - document new config parameter
(cherry picked from commit 989a30bb2d63ee6b9157a9eb6a3d2ff6828abc60)
diff --git a/ldap/servers/slapd/back-ldbm/ldbm_config.c b/ldap/servers/slapd/back-ldbm/ldbm_config.c
index 44ccf78..b713f73 100644
--- a/ldap/servers/slapd/back-ldbm/ldbm_config.c
+++ b/ldap/servers/slapd/back-ldbm/ldbm_config.c
@@ -1339,7 +1339,7 @@ static int ldbm_config_db_deadlock_policy_set(void *arg, void *value, char *erro
int retval = LDAP_SUCCESS;
u_int32_t val = (u_int32_t) ((uintptr_t)value);
- if ((val < DB_LOCK_NORUN) || (val > DB_LOCK_YOUNGEST)) {
+ if (val > DB_LOCK_YOUNGEST) {
PR_snprintf(errorbuf, SLAPI_DSE_RETURNTEXT_SIZE,
"Error: Invalid value for %s (%d). Must be between %d and %d inclusive",
CONFIG_DB_DEADLOCK_POLICY, val, DB_LOCK_DEFAULT, DB_LOCK_YOUNGEST);
10 years, 9 months