From: Hallvard Furuseth <hallvard@openldap.org>
Date: Fri, 17 Oct 2008 20:46:44 +0000 (+0000)
Subject: Fix Debug(%d, scred->bv_len or -1) -> Debug(%ld, (long) scred->bv_len or -1L).
X-Git-Tag: ACLCHECK_0~1235
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b464a790b8839375e7f33010cf592d9cbbebd481;p=openldap

Fix Debug(%d, scred->bv_len or -1) -> Debug(%ld, (long) scred->bv_len or -1L).
Cast sasl_encode() arg from unsigned char* to char*.
Warning cleanup: signed meets unsigned.
---

diff --git a/libraries/libldap/cyrus.c b/libraries/libldap/cyrus.c
index 0aee1c8a68..aad8f8ed88 100644
--- a/libraries/libldap/cyrus.c
+++ b/libraries/libldap/cyrus.c
@@ -162,7 +162,7 @@ sb_sasl_cyrus_encode(
 	ber_int_t ret;
 	unsigned tmpsize = dst->buf_size;
 
-	ret = sasl_encode( sasl_context, buf, len,
+	ret = sasl_encode( sasl_context, (char *)buf, len,
 			   (SASL_CONST char **)&dst->buf_base,
 			   &tmpsize );
 
@@ -556,7 +556,7 @@ ldap_int_sasl_bind(
 				/* and server provided us with data? */
 				Debug( LDAP_DEBUG_TRACE,
 					"ldap_int_sasl_bind: rc=%d sasl=%d len=%ld\n",
-					rc, saslrc, scred ? scred->bv_len : -1 );
+					rc, saslrc, scred ? (long) scred->bv_len : -1L );
 				ber_bvfree( scred );
 				scred = NULL;
 			}
@@ -840,7 +840,7 @@ int ldap_pvt_sasl_secprops(
 	const char *in,
 	sasl_security_properties_t *secprops )
 {
-	int i, j, l;
+	unsigned i, j, l;
 	char **props;
 	unsigned sflags = 0;
 	int got_sflags = 0;