|
 |
f92ce9 |
From 7602bd4138d78c7df9479b3f760895cecd10d7d9 Mon Sep 17 00:00:00 2001
|
|
|
f92ce9 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
f92ce9 |
Date: Tue, 16 Dec 2014 16:10:05 -0500
|
|
|
f92ce9 |
Subject: [PATCH 51/53] Ticket 47451 - Fix jenkins errors
|
|
|
f92ce9 |
|
|
|
f92ce9 |
Description: Fix compiler warnings
|
|
|
f92ce9 |
|
|
|
f92ce9 |
https://fedorahosted.org/389/ticket/47451
|
|
|
f92ce9 |
(cherry picked from commit 3e1d97624f390b96c1de21b115619822b72ebf98)
|
|
|
f92ce9 |
(cherry picked from commit 15e1cdd7d01933d42b83b00e1e8c01c16fd36e8e)
|
|
|
f92ce9 |
---
|
|
|
f92ce9 |
ldap/servers/plugins/dna/dna.c | 6 +-----
|
|
|
f92ce9 |
ldap/servers/plugins/uiduniq/uid.c | 2 --
|
|
|
f92ce9 |
2 files changed, 1 insertion(+), 7 deletions(-)
|
|
|
f92ce9 |
|
|
|
f92ce9 |
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
index ded0bbb..f4a36f0 100644
|
|
|
f92ce9 |
--- a/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
+++ b/ldap/servers/plugins/dna/dna.c
|
|
|
f92ce9 |
@@ -2406,7 +2406,7 @@ static int dna_get_next_value(struct configEntry *config_entry,
|
|
|
f92ce9 |
} else {
|
|
|
f92ce9 |
/* dna_first_free_value() failed for some unknown reason */
|
|
|
f92ce9 |
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
|
|
|
f92ce9 |
- "dna_get_next_value: failed to allocate a new ID!! (set(%d) (max: %d)\n",setval,config_entry->maxval);
|
|
|
f92ce9 |
+ "dna_get_next_value: failed to allocate a new ID!!\n");
|
|
|
f92ce9 |
goto done;
|
|
|
f92ce9 |
}
|
|
|
f92ce9 |
}
|
|
|
f92ce9 |
@@ -3415,8 +3415,6 @@ _dna_pre_op_add(Slapi_PBlock *pb, Slapi_Entry *e, char **errstr)
|
|
|
f92ce9 |
/* dna_first_free_value() failed for some unknown reason */
|
|
|
f92ce9 |
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
|
|
|
f92ce9 |
"dna_pre_op: failed to allocate a new ID!! 2\n");
|
|
|
f92ce9 |
- slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
|
|
|
f92ce9 |
- "dna_get_next_value: failed to allocate a new ID!! (set(%d) (max: %d)\n",setval,config_entry->maxval);
|
|
|
f92ce9 |
/* Set an error string to be returned to the client. */
|
|
|
f92ce9 |
*errstr = slapi_ch_smprintf("Allocation of a new value for range"
|
|
|
f92ce9 |
" %s failed! Unable to proceed.",
|
|
|
f92ce9 |
@@ -3682,8 +3680,6 @@ _dna_pre_op_modify(Slapi_PBlock *pb, Slapi_Entry *e, Slapi_Mods *smods, char **e
|
|
|
f92ce9 |
/* dna_first_free_value() failed for some unknown reason */
|
|
|
f92ce9 |
slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
|
|
|
f92ce9 |
"dna_pre_op: failed to allocate a new ID!!\n");
|
|
|
f92ce9 |
- slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
|
|
|
f92ce9 |
- "dna_get_next_value: failed to allocate a new ID!! (set(%d) (max: %d)\n",setval,config_entry->maxval);
|
|
|
f92ce9 |
/* Set an error string to be returned to the client. */
|
|
|
f92ce9 |
*errstr = slapi_ch_smprintf("Allocation of a new value for range"
|
|
|
f92ce9 |
" %s failed! Unable to proceed.",
|
|
|
f92ce9 |
diff --git a/ldap/servers/plugins/uiduniq/uid.c b/ldap/servers/plugins/uiduniq/uid.c
|
|
|
f92ce9 |
index f37ab8c..2120b4f 100644
|
|
|
f92ce9 |
--- a/ldap/servers/plugins/uiduniq/uid.c
|
|
|
f92ce9 |
+++ b/ldap/servers/plugins/uiduniq/uid.c
|
|
|
f92ce9 |
@@ -1285,7 +1285,6 @@ uiduniq_start(Slapi_PBlock *pb)
|
|
|
f92ce9 |
static int
|
|
|
f92ce9 |
uiduniq_close(Slapi_PBlock *pb)
|
|
|
f92ce9 |
{
|
|
|
f92ce9 |
- Slapi_Entry *plugin_entry = NULL;
|
|
|
f92ce9 |
struct attr_uniqueness_config *config = NULL;
|
|
|
f92ce9 |
|
|
|
f92ce9 |
slapi_pblock_get(pb, SLAPI_PLUGIN_PRIVATE, &config);
|
|
|
f92ce9 |
@@ -1312,7 +1311,6 @@ NSUniqueAttr_Init(Slapi_PBlock *pb)
|
|
|
f92ce9 |
int preadd = SLAPI_PLUGIN_PRE_ADD_FN;
|
|
|
f92ce9 |
int premod = SLAPI_PLUGIN_PRE_MODIFY_FN;
|
|
|
f92ce9 |
int premdn = SLAPI_PLUGIN_PRE_MODRDN_FN;
|
|
|
f92ce9 |
- struct attr_uniqueness_config *config = NULL;
|
|
|
f92ce9 |
|
|
|
f92ce9 |
BEGIN
|
|
|
f92ce9 |
|
|
|
f92ce9 |
--
|
|
|
f92ce9 |
1.9.3
|
|
|
f92ce9 |
|