ldap/servers Makefile.in

[William Brown]

Makefile.in              |    5 ++---
 ldap/servers/slapd/log.c |    6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 7cf83ac9d362bcbd12d8d0de41dc4bd620ad641c
Author: William Brown 
Date:   Tue Jan 19 09:04:32 2016 +1000

Ticket 47968 - Change to slapi_UTF8NCASECMP

Bug Description:  > ldap/servers/slapd/log.c:420:51: warning: pointer targets in
    passing argument 2 of 'slapi_utf8ncasecmp' differ in signedness [-Wpointer-sign]

Fix Description:  We should change to use slapi_UTF8NCASECMP

Commit under "1 line" rule.

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

Author: wibrown

Review by: nhosoi (Thanks)

diff --git a/Makefile.in b/Makefile.in
index 2ad44c2..f5941eb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1003,8 +1003,7 @@ am_migratecred_bin_OBJECTS = ldap/servers/slapd/tools/migratecred_bin-migratecre
 migratecred_bin_OBJECTS = $(am_migratecred_bin_OBJECTS)
 migratecred_bin_DEPENDENCIES = libslapd.la $(am__DEPENDENCIES_1) \
    $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_mmldif_bin_OBJECTS =  \
    ldap/servers/slapd/tools/mmldif_bin-mmldif.$(OBJEXT)
 mmldif_bin_OBJECTS = $(am_mmldif_bin_OBJECTS)
@@ -2988,7 +2987,7 @@ ldif_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK_NOTHR) $(SASL_LINK)
 #------------------------
 migratecred_bin_SOURCES = ldap/servers/slapd/tools/migratecred.c
 migratecred_bin_CPPFLAGS = $(AM_CPPFLAGS) @openldap_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-migratecred_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(SYSTEMD_LINK)
+migratecred_bin_LDADD = libslapd.la $(NSPR_LINK) $(NSS_LINK) $(SVRCORE_LINK) $(LDAPSDK_LINK) $(SASL_LINK)

#------------------------
 # mmldif
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index cbfba54..a8ab969 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -417,12 +417,12 @@ log_set_backend(const char *attrname, char *value, int logtype, char *errorbuf,
         if(strlen(backendstr) == 0) {
             /* Probably means someone did ",,"*/
             continue;
-        } else if (slapi_utf8ncasecmp(backendstr, "dirsrv-log", 10) ) {
+        } else if (slapi_UTF8NCASECMP(backendstr, "dirsrv-log", 10) ) {
             backend |= LOGGING_BACKEND_INTERNAL;
-        } else if (slapi_utf8ncasecmp(backendstr, "syslog", 6) ) {
+        } else if (slapi_UTF8NCASECMP(backendstr, "syslog", 6) ) {
             backend |= LOGGING_BACKEND_SYSLOG;
 #ifdef WITH_SYSTEMD
-        } else if (slapi_utf8ncasecmp(backendstr, "journald", 8) ) {
+        } else if (slapi_UTF8NCASECMP(backendstr, "journald", 8) ) {
             backend |= LOGGING_BACKEND_JOURNALD;
 #endif
         }