ITS#2657: authzid (and assertion) should apply to most everything

[openldap] / libraries / libldap / getdn.c

diff --git a/libraries/libldap/getdn.c b/libraries/libldap/getdn.c
index 60ffe1aa2e9f22b0f799f36a413e12dccba7a616..23bd41b640c0ab855f0d2e66b00a50679527bf6c 100644 (file)
--- 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: