More conversions of NULL -> talloc_autofree_context()

so we at least know when we're using a long-lived context.
Jeremy.

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 8a567dc751f03d8a2a373e941f251b5826ae01da..152c23bd150c39f679ef563c8a2fecde0b3ab2ae 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -346,7 +346,7 @@ bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
        }
        
        asn1_start_tag(data, ASN1_CONTEXT(2));
-       asn1_read_OctetString(data, NULL, &edata_contents);
+       asn1_read_OctetString(data, talloc_autofree_context(), &edata_contents);
        asn1_end_tag(data);
        asn1_end_tag(data);
        asn1_end_tag(data);
@@ -389,7 +389,7 @@ bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_
        
        asn1_end_tag(data);
        asn1_start_tag(data, ASN1_CONTEXT(1));
-       asn1_read_OctetString(data, NULL, &pac_contents);
+       asn1_read_OctetString(data, talloc_autofree_context(), &pac_contents);
        asn1_end_tag(data);
        asn1_end_tag(data);
        asn1_end_tag(data);

diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index fb95d719259a5f2e54d68f11d43d2eb3ad636552..e586d976cf35643c800f5698cfb242d7a05204b4 100644 (file)
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -151,7 +151,7 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
        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,NULL,&oid_str);
+               asn1_read_OID(data,talloc_autofree_context(),&oid_str);
                OIDs[i] = CONST_DISCARD(char *, oid_str);
        }
        OIDs[i] = NULL;
@@ -163,7 +163,7 @@ bool spnego_parse_negTokenInit(DATA_BLOB blob,
                asn1_start_tag(data, ASN1_CONTEXT(3));
                asn1_start_tag(data, ASN1_SEQUENCE(0));
                asn1_start_tag(data, ASN1_CONTEXT(0));
-               asn1_read_GeneralString(data,NULL,principal);
+               asn1_read_GeneralString(data,talloc_autofree_context(),principal);
                asn1_end_tag(data);
                asn1_end_tag(data);
                asn1_end_tag(data);
@@ -256,7 +256,7 @@ bool parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
        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,NULL,&oid_str);
+               asn1_read_OID(data,talloc_autofree_context(),&oid_str);
                OIDs[i] = CONST_DISCARD(char *, oid_str);
        }
        OIDs[i] = NULL;
@@ -276,7 +276,7 @@ bool parse_negTokenTarg(DATA_BLOB blob, char *OIDs[ASN1_MAX_OIDS], DATA_BLOB *se
        }
 
        asn1_start_tag(data, ASN1_CONTEXT(2));
-       asn1_read_OctetString(data,NULL,secblob);
+       asn1_read_OctetString(data,talloc_autofree_context(),secblob);
        asn1_end_tag(data);
 
        asn1_end_tag(data);
@@ -436,13 +436,13 @@ bool spnego_parse_challenge(const DATA_BLOB blob,
        asn1_end_tag(data);
 
        asn1_start_tag(data,ASN1_CONTEXT(2));
-       asn1_read_OctetString(data, NULL, chal1);
+       asn1_read_OctetString(data, talloc_autofree_context(), chal1);
        asn1_end_tag(data);
 
        /* the second challenge is optional (XP doesn't send it) */
        if (asn1_tag_remaining(data)) {
                asn1_start_tag(data,ASN1_CONTEXT(3));
-               asn1_read_OctetString(data, NULL, chal2);
+               asn1_read_OctetString(data, talloc_autofree_context(), chal2);
                asn1_end_tag(data);
        }
 
@@ -505,7 +505,7 @@ bool spnego_parse_auth(DATA_BLOB blob, DATA_BLOB *auth)
        asn1_start_tag(data, ASN1_CONTEXT(1));
        asn1_start_tag(data, ASN1_SEQUENCE(0));
        asn1_start_tag(data, ASN1_CONTEXT(2));
-       asn1_read_OctetString(data, NULL, auth);
+       asn1_read_OctetString(data, talloc_autofree_context(), auth);
        asn1_end_tag(data);
        asn1_end_tag(data);
        asn1_end_tag(data);
@@ -609,7 +609,7 @@ bool spnego_parse_auth_response(DATA_BLOB blob, NTSTATUS nt_status,
 
                if (asn1_tag_remaining(data)) {
                        asn1_start_tag(data,ASN1_CONTEXT(2));
-                       asn1_read_OctetString(data, NULL, auth);
+                       asn1_read_OctetString(data, talloc_autofree_context(), auth);
                        asn1_end_tag(data);
                }
        } else if (negResult == SPNEGO_NEG_RESULT_INCOMPLETE) {
@@ -623,7 +623,7 @@ bool spnego_parse_auth_response(DATA_BLOB blob, NTSTATUS nt_status,
        if (asn1_tag_remaining(data)) {
                DATA_BLOB mechList = data_blob_null;
                asn1_start_tag(data, ASN1_CONTEXT(3));
-               asn1_read_OctetString(data, NULL, &mechList);
+               asn1_read_OctetString(data, talloc_autofree_context(), &mechList);
                asn1_end_tag(data);
                data_blob_free(&mechList);
                DEBUG(5,("spnego_parse_auth_response received mechListMIC, "

diff --git a/source3/libsmb/spnego.c b/source3/libsmb/spnego.c
index 3fa9559cfb1aab06ad90c5e72d3ae488bd0d4450..528c7f400902dd3fc110cc88d945c200e7fe249d 100644 (file)
--- a/source3/libsmb/spnego.c
+++ b/source3/libsmb/spnego.c
@@ -46,12 +46,13 @@ static bool read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t *token)
                                     0 < asn1_tag_remaining(asn1); i++) {
                                const char *p_oid = NULL;
                                token->mechTypes = 
-                                       TALLOC_REALLOC_ARRAY(NULL, token->mechTypes, const char *, i + 2);
+                                       TALLOC_REALLOC_ARRAY(talloc_autofree_context(),
+                                               token->mechTypes, const char *, i + 2);
                                if (!token->mechTypes) {
                                        asn1->has_error = True;
                                        return False;
                                }
-                               asn1_read_OID(asn1, NULL, &p_oid);
+                               asn1_read_OID(asn1, talloc_autofree_context(), &p_oid);
                                token->mechTypes[i] = p_oid;
                        }
                        token->mechTypes[i] = NULL;
@@ -69,14 +70,15 @@ static bool read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t *token)
                 /* Read mechToken */
                case ASN1_CONTEXT(2):
                        asn1_start_tag(asn1, ASN1_CONTEXT(2));
-                       asn1_read_OctetString(asn1, NULL, &token->mechToken);
+                       asn1_read_OctetString(asn1,
+                               talloc_autofree_context(), &token->mechToken);
                        asn1_end_tag(asn1);
                        break;
                /* Read mecListMIC */
                case ASN1_CONTEXT(3):
                        asn1_start_tag(asn1, ASN1_CONTEXT(3));
                        if (asn1->data[asn1->ofs] == ASN1_OCTET_STRING) {
-                               asn1_read_OctetString(asn1, NULL,
+                               asn1_read_OctetString(asn1, talloc_autofree_context(),
                                                      &token->mechListMIC);
                        } else {
                                /* RFC 2478 says we have an Octet String here,
@@ -84,7 +86,8 @@ static bool read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t *token)
                                char *mechListMIC;
                                asn1_push_tag(asn1, ASN1_SEQUENCE(0));
                                asn1_push_tag(asn1, ASN1_CONTEXT(0));
-                               asn1_read_GeneralString(asn1, NULL, &mechListMIC);
+                               asn1_read_GeneralString(asn1,
+                                       talloc_autofree_context(), &mechListMIC);
                                asn1_pop_tag(asn1);
                                asn1_pop_tag(asn1);
 
@@ -188,19 +191,21 @@ static bool read_negTokenTarg(ASN1_DATA *asn1, negTokenTarg_t *token)
                case ASN1_CONTEXT(1): {
                        const char *mech = NULL;
                        asn1_start_tag(asn1, ASN1_CONTEXT(1));
-                       asn1_read_OID(asn1, NULL, &mech);
+                       asn1_read_OID(asn1, talloc_autofree_context(), &mech);
                        asn1_end_tag(asn1);
                        token->supportedMech = CONST_DISCARD(char *, mech);
                        }
                        break;
                case ASN1_CONTEXT(2):
                        asn1_start_tag(asn1, ASN1_CONTEXT(2));
-                       asn1_read_OctetString(asn1, NULL, &token->responseToken);
+                       asn1_read_OctetString(asn1,
+                               talloc_autofree_context(), &token->responseToken);
                        asn1_end_tag(asn1);
                        break;
                case ASN1_CONTEXT(3):
                        asn1_start_tag(asn1, ASN1_CONTEXT(3));
-                       asn1_read_OctetString(asn1, NULL, &token->mechListMIC);
+                       asn1_read_OctetString(asn1,
+                               talloc_autofree_context(), &token->mechListMIC);
                        asn1_end_tag(asn1);
                        break;
                default: