Branch '389-ds-base-1.3.1' - ldap/servers

[Mark Reynolds]

ldap/servers/plugins/posix-winsync/posix-group-task.c |    1 +
 ldap/servers/plugins/posix-winsync/posix-winsync.c    |    1 +
 ldap/servers/slapd/util.c                             |    4 ++++
 3 files changed, 6 insertions(+)

New commits:
commit ba8c2e3e4dfe9bd2f863e3fa8177c7ed7fcbc43a
Author: Mark Reynolds 
Date:   Wed Oct 2 18:21:49 2013 -0400

Ticket 47543 - Mozldap - fix compiler warnings

Fix these warnings:

../ds/ldap/servers/slapd/util.c: In function 'filter_stuff_func':
    ../ds/ldap/servers/slapd/util.c:257: warning: unused variable 'raw_filter'
    ../ds/ldap/servers/slapd/util.c:256: warning: unused variable 'escaped_filter'
    ../ds/ldap/servers/slapd/util.c: In function 'slapi_escape_filter_value':
    ../ds/ldap/servers/slapd/util.c:450: warning: unused variable 'raw_filter'
    ../ds/ldap/servers/slapd/util.c:449: warning: unused variable 'escaped_filter'
    ../ds/ldap/servers/plugins/posix-winsync/posix-winsync.c: In function 'sync_acct_disable':
    ../ds/ldap/servers/plugins/posix-winsync/posix-winsync.c:313: warning: implicit declaration of function 'strlen'
    ../ds/ldap/servers/plugins/posix-winsync/posix-winsync.c:313: warning: incompatible implicit declaration of built-in function 'strlen'
    ../ds/ldap/servers/plugins/posix-winsync/posix-group-task.c: In function 'posix_group_fix_memberuid_callback':
    ../ds/ldap/servers/plugins/posix-winsync/posix-group-task.c:283: warning: implicit declaration of function 'strlen'
    ../ds/ldap/servers/plugins/posix-winsync/posix-group-task.c:283: warning: incompatible implicit declaration of built-in function 'strlen'
    ../ds/ldap/servers/plugins/posix-winsync/posix-group-task.c:356: warning: implicit declaration of function 'strncasecmp'

https://fedorahosted.org/389/ticket/47543

Reviewed by: richm(Thanks!)
    (cherry picked from commit 92f9e8393a2bc558fc77d569749199e987e25472)

diff --git a/ldap/servers/plugins/posix-winsync/posix-group-task.c b/ldap/servers/plugins/posix-winsync/posix-group-task.c
index 02a1d82..69c5eab 100644
--- a/ldap/servers/plugins/posix-winsync/posix-group-task.c
+++ b/ldap/servers/plugins/posix-winsync/posix-group-task.c
@@ -1,5 +1,6 @@
 #include "slapi-plugin.h"
 #include "nspr.h"
+#include <string.h>

#include "posix-wsp-ident.h"
 #include "posix-group-func.h"
diff --git a/ldap/servers/plugins/posix-winsync/posix-winsync.c b/ldap/servers/plugins/posix-winsync/posix-winsync.c
index 154e22a..c252abd 100644
--- a/ldap/servers/plugins/posix-winsync/posix-winsync.c
+++ b/ldap/servers/plugins/posix-winsync/posix-winsync.c
@@ -63,6 +63,7 @@
 #include <dirsrv/winsync-plugin.h>
 #endif
 #include <plstr.h>
+#include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include "posix-wsp-ident.h"
diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 80ac0ca..cd69a45 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -253,8 +253,10 @@ static PRIntn
 filter_stuff_func(void *arg, const char *val, PRUint32 slen)
 {
     struct filter_ctx *ctx = (struct filter_ctx *)arg;
+#if defined (USE_OPENLDAP)
     struct berval escaped_filter;
     struct berval raw_filter;
+#endif
     char *buf = (char *)val;
     int extra_space;
     int filter_len = slen;
@@ -446,8 +448,10 @@ slapi_filter_sprintf(const char *fmt, ...)
 char*
 slapi_escape_filter_value(char* filter_str, int len)
 {
+#if defined (USE_OPENLDAP)
     struct berval escaped_filter;
     struct berval raw_filter;
+#endif
     int filter_len;

/*