svn commit: samba r2036 - branches/SAMBA_4_0/source/libcli/auth

tridge at samba.org tridge at samba.org
Wed Aug 25 02:04:36 GMT 2004


Author: tridge
Date: 2004-08-25 02:04:35 +0000 (Wed, 25 Aug 2004)
New Revision: 2036

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=2036&nolog=1

Log:
switched the spnego code to use talloc

now that talloc_free() doesn't need to take a context ptr, there is no
reason we can't use talloc everywhere that we currently use malloc().




Modified:
   branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-08-25 01:58:08 UTC (rev 2035)
+++ branches/SAMBA_4_0/source/libcli/auth/spnego_parse.c	2004-08-25 02:04:35 UTC (rev 2036)
@@ -47,12 +47,12 @@
 			asn1_start_tag(asn1, ASN1_CONTEXT(0));
 			asn1_start_tag(asn1, ASN1_SEQUENCE(0));
 
-			token->mechTypes = malloc(sizeof(*token->mechTypes));
+			token->mechTypes = talloc(NULL, sizeof(*token->mechTypes));
 			for (i = 0; !asn1->has_error &&
 				     0 < asn1_tag_remaining(asn1); i++) {
 				token->mechTypes = 
-					realloc(token->mechTypes, (i + 2) *
-						sizeof(*token->mechTypes));
+					talloc_realloc(token->mechTypes, (i + 2) *
+						       sizeof(*token->mechTypes));
 				asn1_read_OID(asn1, token->mechTypes + i);
 			}
 			token->mechTypes[i] = NULL;
@@ -347,9 +347,9 @@
 		if (spnego->negTokenInit.mechTypes) {
 			int i;
 			for (i = 0; spnego->negTokenInit.mechTypes[i]; i++) {
-				free(spnego->negTokenInit.mechTypes[i]);
+				talloc_free(spnego->negTokenInit.mechTypes[i]);
 			}
-			free(spnego->negTokenInit.mechTypes);
+			talloc_free(spnego->negTokenInit.mechTypes);
 		}
 		data_blob_free(&spnego->negTokenInit.mechToken);
 		data_blob_free(&spnego->negTokenInit.mechListMIC);



More information about the samba-cvs mailing list