s3/s4:auth SPNEGO - adaptions for the removed "const" from OIDs

This is needed in order to suppress warnings.

diff --git a/libcli/auth/spnego_parse.c b/libcli/auth/spnego_parse.c
index 27ede1bde4783144252f3cba172dbaf7b7241d5d..3bf7aeab6277c76576a9a6f75b6b5582f12b3177 100644 (file)
--- a/libcli/auth/spnego_parse.c
+++ b/libcli/auth/spnego_parse.c
@@ -49,10 +49,12 @@ static bool read_negTokenInit(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
                        token->mechTypes = talloc(NULL, const char *);
                        for (i = 0; !asn1->has_error &&
                                     0 < asn1_tag_remaining(asn1); i++) {
+                               char *oid;
                                token->mechTypes = talloc_realloc(NULL,
                                                                  token->mechTypes,
                                                                  const char *, i+2);
-                               asn1_read_OID(asn1, token->mechTypes, token->mechTypes + i);
+                               asn1_read_OID(asn1, token->mechTypes, &oid);
+                               token->mechTypes[i] = oid;
                        }
                        token->mechTypes[i] = NULL;
 
@@ -184,6 +186,7 @@ static bool read_negTokenTarg(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
 
        while (!asn1->has_error && 0 < asn1_tag_remaining(asn1)) {
                uint8_t context;
+               char *oid;
                if (!asn1_peek_uint8(asn1, &context)) {
                        asn1->has_error = true;
                        break;
@@ -199,7 +202,8 @@ static bool read_negTokenTarg(struct asn1_data *asn1, TALLOC_CTX *mem_ctx,
                        break;
                case ASN1_CONTEXT(1):
                        asn1_start_tag(asn1, ASN1_CONTEXT(1));
-                       asn1_read_OID(asn1, mem_ctx, &token->supportedMech);
+                       asn1_read_OID(asn1, mem_ctx, &oid);
+                       token->supportedMech = oid;
                        asn1_end_tag(asn1);
                        break;
                case ASN1_CONTEXT(2):

diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 9ef848b59ce5e4b6f13b8e5be93bb8391e7014ad..382a29ac657deeb1ab895f3bed8087dffa6e80f4 100644 (file)
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -125,9 +125,7 @@ bool spnego_parse_negTokenInit(TALLOC_CTX *ctx,
        asn1_start_tag(data,ASN1_CONTEXT(0));
        asn1_start_tag(data,ASN1_SEQUENCE(0));
        for (i=0; asn1_tag_remaining(data) > 0 && i < ASN1_MAX_OIDS-1; i++) {
-               const char *oid_str = NULL;
-               asn1_read_OID(data,ctx,&oid_str);
-               OIDs[i] = CONST_DISCARD(char *, oid_str);
+               asn1_read_OID(data,ctx, &OIDs[i]);
        }
        OIDs[i] = NULL;
        asn1_end_tag(data);