Commit 4533cf4 Ticket 49229 - Correct issues in latest commits

6 files Authored by firstyear a month ago , Committed by mreynolds a month ago ,
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@redhat.com>

    
1 @@ -463,6 +463,7 @@
2   »       ldap/servers/slapd/log.h \
3   »       ldap/servers/slapd/mozldap.h \
4   »       ldap/servers/slapd/openldapber.h \
5 + »       ldap/servers/slapd/pblock_v3.h \
6   »       ldap/servers/slapd/poll_using_select.h \
7   »       ldap/servers/slapd/prerrstrs.h \
8   »       ldap/servers/slapd/protect_db.h \
 1 @@ -2100,7 +2100,7 @@
 2   
 3   »       default:
 4   »       »       slapi_log_err(SLAPI_LOG_ERR, "slapi_pblock_get", "Unknown parameter block argument %d\n", arg);
 5 - #ifdef DEBUG
 6 + #ifdef PBLOCK_ANALYTICS
 7           Slapi_PBlock *boom = NULL;
 8           void *x = (void *)boom->pb_plugin;
 9   #endif
10 @@ -3744,7 +3744,7 @@
11   »       default:
12   »       »       slapi_log_err(SLAPI_LOG_ERR, "slapi_pblock_set",
13   »       »           "Unknown parameter block argument %d\n", arg);
14 - #ifdef DEBUG
15 + #ifdef PBLOCK_ANALYTICS
16           Slapi_PBlock *boom = NULL;
17           void *x = (void *)boom->pb_plugin;
18   #endif
1 @@ -1753,7 +1753,7 @@
2     Slapi_DN **pw_admin_user;
3   } passwdPolicy;
4   
5 - Slapi_PBlock * slapi_pblock_clone(Slapi_PBlock *pb) __attribute__((deprecated));
6 + Slapi_PBlock * slapi_pblock_clone(Slapi_PBlock *pb);  /* deprecated */
7   
8   passwdPolicy * slapi_pblock_get_pwdpolicy(Slapi_PBlock *pb);
9   void slapi_pblock_set_pwdpolicy(Slapi_PBlock *pb, passwdPolicy *pwdpolicy);
1 @@ -1007,7 +1007,7 @@
2       char *namespaceid = (char *)fetch_attr(e, "nsUniqueIdGeneratorNamespace", NULL);
3       slapi_pblock_set(mypb, SLAPI_LDIF2DB_NAMESPACEID, namespaceid);
4   
5 -     slapi_pblock_set(mypb, SLAPI_BACKEND_INSTANCE_NAME, instance_name);
6 +     slapi_pblock_set(mypb, SLAPI_BACKEND_INSTANCE_NAME, (void *)instance_name);
7       slapi_pblock_set(mypb, SLAPI_LDIF2DB_FILE, ldif_file);
8       slapi_pblock_set(mypb, SLAPI_LDIF2DB_INCLUDE, include);
9       slapi_pblock_set(mypb, SLAPI_LDIF2DB_EXCLUDE, exclude);
1 @@ -20,6 +20,7 @@
2   #include "ldap-agent.h"
3   #include "ldap.h"
4   #include "ldif.h"
5 + #include <ctype.h>
6   
7   static char *agentx_master = NULL;
8   static char *agent_logdir = NULL;
 1 @@ -28,7 +28,8 @@
 2   #ifdef DEBUG
 3           if (sds_ht_crc32c_verify_node(work_node) != SDS_SUCCESS) {
 4               sds_log("sds_ht_map_nodes", "ht_node_%p failed verification", work_node);
 5 -             return SDS_CHECKSUM_FAILURE;
 6 +             result = SDS_CHECKSUM_FAILURE;
 7 +             goto out;
 8           }
 9   #endif
10           // add nodes to the list
11 @@ -45,7 +46,7 @@
12               result = internal_result;
13   #ifdef DEBUG
14               sds_log("sds_ht_map_nodes", "Encountered an issue with ht_node_%p: %d\n", work_node, internal_result);
15 -             return result;
16 +             goto out;
17   #endif
18           }
19           // And get the next node for us to work on.
20 @@ -54,6 +55,9 @@
21               work_node = NULL;
22           }
23       }
24 + 
25 + out:
26 +     sds_queue_destroy(node_q);
27       return result;
28   
29   }