[389-commits] 7 commits - ldap/servers

ldap/servers/slapd/back-ldbm/dblayer.c | 3 --
ldap/servers/slapd/ch_malloc.c | 37 ---------------------------------
ldap/servers/slapd/localhost.c | 3 --
ldap/servers/slapd/main.c | 13 +----------
ldap/servers/slapd/slapi-plugin.h | 1
ldap/servers/slapd/task.c | 10 +++-----
ldap/servers/slapd/tools/dbscan.c | 14 ++++--------
ldap/servers/snmp/main.c | 7 +-----
8 files changed, 15 insertions(+), 73 deletions(-)

New commits:
commit 3a66ec7ca61ee273eb016fe234a3da8202e58e83
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed Jul 9 16:08:21 2014 -0700

Revert "Ticket #47835 - Coverity: 12687..12692"

This reverts commit 43c6ff2e7801ff6bbc03961b3161dd60aebf707a.

diff --git a/ldap/servers/slapd/tools/dbscan.c b/ldap/servers/slapd/tools/dbscan.c
index bbfcd0e..023fade 100644
--- a/ldap/servers/slapd/tools/dbscan.c
+++ b/ldap/servers/slapd/tools/dbscan.c
@@ -1077,17 +1077,16 @@ is_changelog(char *filename)

static void usage(char *argv0)
{
- long arg_max = sysconf(_SC_ARG_MAX);
- char *copy = strndup(argv0, arg_max);
+ char *copy = strdup(argv0);
char *p0 = NULL, *p1 = NULL;
- if (copy && (strlen(copy) < arg_max)) {
+ if (NULL != copy) {
/* the full path is not needed in the usages */
- p0 = strrchr(copy, '/');
- if (p0) {
+ p0 = strrchr(argv0, '/');
+ if (NULL != p0) {
*p0 = '\0';
p0++;
} else {
- p0 = copy;
+ p0 = argv0;
}
p1 = strrchr(p0, '-'); /* get rid of -bin from the usage */
if (NULL != p1) {
@@ -1125,9 +1124,6 @@ static void usage(char *argv0)
printf(" # display summary of objectclass.db4\n");
printf(" %s -f objectclass.db4\n", p0);
printf("\n");
- if (copy) {
- free(copy);
- }
exit(1);
}

commit dc4527b6f6ebe7a2c42eb57942af535c31c5cd59
Author: Noriko Hosoi <nhosoi@redhat.com>
Date: Wed Jul 9 16:08:11 2014 -0700

Revert "Ticket #47835 - Coverity: 12687..12692"

This reverts commit 0a546bcb3d4625d6db1dcbb342922b4ddb3bee37.

diff --git a/ldap/servers/slapd/main.c b/ldap/servers/slapd/main.c
index 1726e67..d577514 100644
--- a/ldap/servers/slapd/main.c
+++ b/ldap/servers/slapd/main.c
@@ -650,8 +650,6 @@ main( int argc, char **argv)
int return_value = 0;
slapdFrontendConfig_t *slapdFrontendConfig = getFrontendConfig();
daemon_ports_t ports_info = {0};
- long arg_max = 0;
-
#ifndef __LP64__
#if defined(__hpux) && !defined(__ia64)
/* for static constructors */
@@ -724,16 +722,9 @@ main( int argc, char **argv)