This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master
in repository 389-ds-base.
commit 4533cf43e27018ad8021738c2de7d10b2b467969
Author: William Brown <firstyear(a)redhat.com>
Date: Fri Apr 21 10:45:16 2017 +1000
Ticket 49229 - Correct issues in latest commits
Bug Description: Some ticket updates have broken jenkins with
warnings, and the rpm build due to a new header
Fix Description: Fix the ht verify ot free the queue, fix the
compiler warnings, and correct makefile.am to dist the headers.
https://pagure.io/389-ds-base/issue/49229
Author: wibrown
Review by: mreynolds
Signed-off-by: Mark Reynolds <mreynolds(a)redhat.com>
---
Makefile.am | 1 +
ldap/servers/slapd/pblock.c | 4 ++--
ldap/servers/slapd/slap.h | 2 +-
ldap/servers/slapd/task.c | 2 +-
ldap/servers/snmp/main.c | 1 +
src/libsds/sds/ht/map.c | 8 ++++++--
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 06217ff..bedccbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -463,6 +463,7 @@ dist_noinst_HEADERS = \
ldap/servers/slapd/log.h \
ldap/servers/slapd/mozldap.h \
ldap/servers/slapd/openldapber.h \
+ ldap/servers/slapd/pblock_v3.h \
ldap/servers/slapd/poll_using_select.h \
ldap/servers/slapd/prerrstrs.h \
ldap/servers/slapd/protect_db.h \
diff --git a/ldap/servers/slapd/pblock.c b/ldap/servers/slapd/pblock.c
index 916770d..4f03c90 100644
--- a/ldap/servers/slapd/pblock.c
+++ b/ldap/servers/slapd/pblock.c
@@ -2100,7 +2100,7 @@ slapi_pblock_get( Slapi_PBlock *pblock, int arg, void *value )
default:
slapi_log_err(SLAPI_LOG_ERR, "slapi_pblock_get", "Unknown parameter
block argument %d\n", arg);
-#ifdef DEBUG
+#ifdef PBLOCK_ANALYTICS
Slapi_PBlock *boom = NULL;
void *x = (void *)boom->pb_plugin;
#endif
@@ -3744,7 +3744,7 @@ slapi_pblock_set( Slapi_PBlock *pblock, int arg, void *value )
default:
slapi_log_err(SLAPI_LOG_ERR, "slapi_pblock_set",
"Unknown parameter block argument %d\n", arg);
-#ifdef DEBUG
+#ifdef PBLOCK_ANALYTICS
Slapi_PBlock *boom = NULL;
void *x = (void *)boom->pb_plugin;
#endif
diff --git a/ldap/servers/slapd/slap.h b/ldap/servers/slapd/slap.h
index 5cba23e..52c9c40 100644
--- a/ldap/servers/slapd/slap.h
+++ b/ldap/servers/slapd/slap.h
@@ -1753,7 +1753,7 @@ typedef struct passwordpolicyarray {
Slapi_DN **pw_admin_user;
} passwdPolicy;
-Slapi_PBlock * slapi_pblock_clone(Slapi_PBlock *pb) __attribute__((deprecated));
+Slapi_PBlock * slapi_pblock_clone(Slapi_PBlock *pb); /* deprecated */
passwdPolicy * slapi_pblock_get_pwdpolicy(Slapi_PBlock *pb);
void slapi_pblock_set_pwdpolicy(Slapi_PBlock *pb, passwdPolicy *pwdpolicy);
diff --git a/ldap/servers/slapd/task.c b/ldap/servers/slapd/task.c
index 8bdf812..defae2b 100644
--- a/ldap/servers/slapd/task.c
+++ b/ldap/servers/slapd/task.c
@@ -1007,7 +1007,7 @@ static int task_import_add(Slapi_PBlock *pb
__attribute__((unused)),
char *namespaceid = (char *)fetch_attr(e, "nsUniqueIdGeneratorNamespace",
NULL);
slapi_pblock_set(mypb, SLAPI_LDIF2DB_NAMESPACEID, namespaceid);
- slapi_pblock_set(mypb, SLAPI_BACKEND_INSTANCE_NAME, instance_name);
+ slapi_pblock_set(mypb, SLAPI_BACKEND_INSTANCE_NAME, (void *)instance_name);
slapi_pblock_set(mypb, SLAPI_LDIF2DB_FILE, ldif_file);
slapi_pblock_set(mypb, SLAPI_LDIF2DB_INCLUDE, include);
slapi_pblock_set(mypb, SLAPI_LDIF2DB_EXCLUDE, exclude);
diff --git a/ldap/servers/snmp/main.c b/ldap/servers/snmp/main.c
index 8166136..67277b7 100644
--- a/ldap/servers/snmp/main.c
+++ b/ldap/servers/snmp/main.c
@@ -20,6 +20,7 @@
#include "ldap-agent.h"
#include "ldap.h"
#include "ldif.h"
+#include <ctype.h>
static char *agentx_master = NULL;
static char *agent_logdir = NULL;
diff --git a/src/libsds/sds/ht/map.c b/src/libsds/sds/ht/map.c
index 58ea060..d39f241 100644
--- a/src/libsds/sds/ht/map.c
+++ b/src/libsds/sds/ht/map.c
@@ -28,7 +28,8 @@ sds_ht_map_nodes(sds_ht_instance *ht_ptr, sds_result
(*map_fn)(sds_ht_instance *
#ifdef DEBUG
if (sds_ht_crc32c_verify_node(work_node) != SDS_SUCCESS) {
sds_log("sds_ht_map_nodes", "ht_node_%p failed
verification", work_node);
- return SDS_CHECKSUM_FAILURE;
+ result = SDS_CHECKSUM_FAILURE;
+ goto out;
}
#endif
// add nodes to the list
@@ -45,7 +46,7 @@ sds_ht_map_nodes(sds_ht_instance *ht_ptr, sds_result
(*map_fn)(sds_ht_instance *
result = internal_result;
#ifdef DEBUG
sds_log("sds_ht_map_nodes", "Encountered an issue with
ht_node_%p: %d\n", work_node, internal_result);
- return result;
+ goto out;
#endif
}
// And get the next node for us to work on.
@@ -54,6 +55,9 @@ sds_ht_map_nodes(sds_ht_instance *ht_ptr, sds_result
(*map_fn)(sds_ht_instance *
work_node = NULL;
}
}
+
+out:
+ sds_queue_destroy(node_q);
return result;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.