Silence compilation warnings in SLAPI plugins

Signed-off-by: Simo Sorce <ssorce@redhat.com>

3 files changed, 9 insertions, 5 deletions

diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
index 5e762bc42..88f6df359 100644
--- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
+++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync-config.c
@@ -59,7 +59,7 @@
 #endif
 #include "ipa-winsync.h"
 
-#include <string.h>
+#include "plstr.h"
 
 #define IPA_WINSYNC_CONFIG_FILTER "(objectclass=*)"
 
@@ -542,7 +542,6 @@ ipa_winsync_apply_config (Slapi_PBlock *pb, Slapi_Entry* entryBefore,
             PR_snprintf(returntext, SLAPI_DSE_RETURNTEXT_SIZE,
                         "Error: could not add value [%s] for attribute name "
                         "[%s] - ldap error [%d: %s]", val, attrsvals[ii],
-                        attrsvals[ii], IPA_WINSYNC_NEW_USER_ATTRS_VALS,
                         rc, ldap_err2string(rc));
             slapi_entry_free(theConfig.config_e);
             theConfig.config_e = NULL;
diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
index 4e2d534fc..ecdda238f 100644
--- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
+++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.c
@@ -59,6 +59,9 @@
 #endif
 #include "ipa-winsync.h"
 
+#include <string.h>
+#include "plstr.h"
+
 static void
 sync_acct_disable(
     void *cbdata, /* the usual domain config data */
@@ -224,7 +227,6 @@ ipa_winsync_pre_ds_add_user_cb(void *cbdata, const Slapi_Entry *rawentry,
     Slapi_Attr *attr = NULL;
     Slapi_Attr *e_attr = NULL;
     char *type = NULL;
-    IPA_WinSync_Config *global_ipaconfig = ipa_winsync_get_config();
 
     LOG("--> ipa_winsync_pre_ds_add_user_cb -- begin\n");
 
@@ -544,7 +546,7 @@ void ipa_winsync_set_plugin_identity(void * identity)
 	ipa_winsync_plugin_id=identity;
 }
 
-void * ipa_winsync_get_plugin_identity()
+void * ipa_winsync_get_plugin_identity(void)
 {
 	return ipa_winsync_plugin_id;
 }
diff --git a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
index 338e67cfb..735f65684 100644
--- a/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
+++ b/daemons/ipa-slapi-plugins/ipa-winsync/ipa-winsync.h
@@ -52,6 +52,9 @@
 #include <dirsrv/winsync-plugin.h>
 #endif /* WINSYNC_TEST_IPA */
 
+#include <string.h>
+#include <strings.h>
+
 #include "util.h"
 
 #define IPA_PLUGIN_NAME "ipa-winsync"
@@ -86,7 +89,7 @@ typedef struct ipa_winsync_domain_config {
 } IPA_WinSync_Domain_Config;
 
 void ipa_winsync_set_plugin_identity(void * identity);
-void * ipa_winsync_get_plugin_identity();
+void * ipa_winsync_get_plugin_identity(void);
 
 int ipa_winsync_config( Slapi_Entry *config_e );
 IPA_WinSync_Config *ipa_winsync_get_config( void );