From 3d61aafa18ccfb02884cf9ec19e016f427e9c94c Mon Sep 17 00:00:00 2001 From: William Brown Date: Aug 27 2020 23:48:20 +0000 Subject: Ticket 51177 - fix warnings Bug Description: Humans make mistakes. A lot of mistakes. In the commit of 51177 I made a mistake of not checking every compiler warning, which led to a mistake that could cause problems for others. Fix Description: There is no fix for humans. But we can fix the compiler warnings. fixes #51177 https://pagure.io/389-ds-base/issue/51177 Author: William Brown Review by: ??? --- diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h index f356857..0531c7e 100644 --- a/ldap/servers/slapd/slapi-private.h +++ b/ldap/servers/slapd/slapi-private.h @@ -1464,6 +1464,9 @@ void slapi_pblock_set_operation_notes(Slapi_PBlock *pb, uint32_t opnotes); void slapi_pblock_set_flag_operation_notes(Slapi_PBlock *pb, uint32_t opflag); void slapi_pblock_set_result_text_if_empty(Slapi_PBlock *pb, char *text); + +int slapi_exists_or_add_internal(Slapi_DN *dn, const char *filter, const char *entry, const char *modifier_name); + #ifdef __cplusplus } #endif diff --git a/ldap/servers/slapd/upgrade.c b/ldap/servers/slapd/upgrade.c index 47d608e..6ce5a2e 100644 --- a/ldap/servers/slapd/upgrade.c +++ b/ldap/servers/slapd/upgrade.c @@ -34,7 +34,7 @@ upgrade_entry_exists_or_create(char *upgrade_id, char *filter, char *dn, char *e int result = slapi_exists_or_add_internal(base_sdn, filter, dupentry, modifier_name); if (result != 0) { - slapi_log_error(SLAPI_LOG_FATAL, upgrade_id, "Failed to create entry: %"PRId32": %s\n", result); + slapi_log_error(SLAPI_LOG_FATAL, upgrade_id, "Failed to create entry: %"PRId32"\n", result); uresult = UPGRADE_FAILURE; } slapi_ch_free_string(&dupentry);