X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetdn.c;h=23bd41b640c0ab855f0d2e66b00a50679527bf6c;hb=afa2cd1893875266c58677cc640514c1d9eef41f;hp=60ffe1aa2e9f22b0f799f36a413e12dccba7a616;hpb=375224128ed7547e114430746e9e2ce67840a188;p=openldap

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 60ffe1aa2e..23bd41b640 100644
--- a/libraries/libldap/getdn.c
+++ b/libraries/libldap/getdn.c
@@ -29,7 +29,7 @@
 
 /* parsing/printing routines */
 static int str2strval( const char *str, ber_len_t stoplen, struct berval *val, 
-		const char **next, unsigned flags, unsigned *retFlags, void *ctx );
+		const char **next, unsigned flags, int *retFlags, void *ctx );
 static int DCE2strval( const char *str, struct berval *val, 
 		const char **next, unsigned flags, void *ctx );
 static int IA52strval( const char *str, struct berval *val, 
@@ -1439,7 +1439,7 @@ return_result:;
  * '\' + HEXPAIR(p) -> unhex(p)
  */
 static int
-str2strval( const char *str, ber_len_t stoplen, struct berval *val, const char **next, unsigned flags, unsigned *retFlags, void *ctx )
+str2strval( const char *str, ber_len_t stoplen, struct berval *val, const char **next, unsigned flags, int *retFlags, void *ctx )
 {
 	const char 	*p, *end, *startPos, *endPos = NULL;
 	ber_len_t	len, escapes;
@@ -3459,7 +3459,7 @@ get_oid:		newAVA->la_attr.bv_val = oidptr;
 				}
 			}
 		}
-		Val.bv_val = str->data;
+		Val.bv_val = (char *) str->data;
 		Val.bv_len = str->length;
 		switch( str->type ) {
 		case V_ASN1_UNIVERSALSTRING: