summaryrefslogtreecommitdiff
path: root/source4/auth/kerberos
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-12-20 12:49:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:29:29 -0500
commitb2d5ec03391dc649843700300f0b939f80c5a1ad (patch)
tree1b8fab560bf9b11ed06c794f9490a88d55797511 /source4/auth/kerberos
parent0cb8a7f058b80701e799593c5a2d1986c6964f18 (diff)
downloadsamba-b2d5ec03391dc649843700300f0b939f80c5a1ad.tar.gz
samba-b2d5ec03391dc649843700300f0b939f80c5a1ad.tar.bz2
samba-b2d5ec03391dc649843700300f0b939f80c5a1ad.zip
r20274: add missing return statement and make it more explicit that we return a NULL DATA_BLOB
metze (This used to be commit 7256481f08b5e860308e73c2b51926b55b1f4c43)
Diffstat (limited to 'source4/auth/kerberos')
-rw-r--r--source4/auth/kerberos/gssapi_parse.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c
index 5226d77a2b..7eefed7ac8 100644
--- a/source4/auth/kerberos/gssapi_parse.c
+++ b/source4/auth/kerberos/gssapi_parse.c
@@ -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 @@ DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *tick
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);