svn commit: samba r20274 - in branches/SAMBA_4_0/source/auth/kerberos: .

metze at samba.org metze at samba.org
Wed Dec 20 12:49:11 GMT 2006


Author: metze
Date: 2006-12-20 12:49:11 +0000 (Wed, 20 Dec 2006)
New Revision: 20274

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20274

Log:
add missing return statement and make it more explicit that we return a NULL DATA_BLOB

metze
Modified:
   branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c


Changeset:
Modified: branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c
===================================================================
--- branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c	2006-12-20 10:54:09 UTC (rev 20273)
+++ branches/SAMBA_4_0/source/auth/kerberos/gssapi_parse.c	2006-12-20 12:49:11 UTC (rev 20274)
@@ -32,10 +32,10 @@
 DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2])
 {
 	struct asn1_data data;
-	DATA_BLOB ret = data_blob(NULL,0);
+	DATA_BLOB ret;
 
 	if (!ticket->data) {
-		return ret;
+		return data_blob(NULL,0);
 	}
 
 	ZERO_STRUCT(data);
@@ -50,6 +50,7 @@
 	if (data.has_error) {
 		DEBUG(1,("Failed to build krb5 wrapper at offset %d\n", (int)data.ofs));
 		asn1_free(&data);
+		return data_blob(NULL,0);
 	}
 
 	ret = data_blob_talloc(mem_ctx, data.data, data.length);



More information about the samba-cvs mailing list