summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2016-01-28 15:50:06 +0100
committerVolker Lendecke <vl@samba.org>2016-02-01 09:53:09 +0100
commit14f1a94b6fb3a55be1e60fe0d28740f04fd94b3f (patch)
tree474c87d1cb79188728728581bab8aeded0507e8c /source3/libsmb
parent8024f532e6bcb6cbd8179817fafdd0f12929d629 (diff)
downloadsamba-14f1a94b6fb3a55be1e60fe0d28740f04fd94b3f.tar.gz
s3:clispnego: fix confusing warning in spnego_gen_krb5_wrap()
asn1_extract_blob() stops further asn1 processing by setting has_error. Don't call asn1_has_error() after asn1_extract_blob() has been successful otherwise we get an "Failed to build krb5 wrapper at" message on success. BUG: https://bugzilla.samba.org/show_bug.cgi?id=11702 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Volker Lendecke <vl@samba.org>
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/clispnego.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
index 3300c85340a..82f13b7a375 100644
--- a/source3/libsmb/clispnego.c
+++ b/source3/libsmb/clispnego.c
@@ -262,14 +262,19 @@ DATA_BLOB spnego_gen_krb5_wrap(TALLOC_CTX *ctx, const DATA_BLOB ticket, const ui
goto err;
}
+ asn1_free(data);
+ data = NULL;
+
err:
- if (asn1_has_error(data)) {
- DEBUG(1, ("Failed to build krb5 wrapper at offset %d\n",
- (int)asn1_current_ofs(data)));
- }
+ if (data != NULL) {
+ if (asn1_has_error(data)) {
+ DEBUG(1, ("Failed to build krb5 wrapper at offset %d\n",
+ (int)asn1_current_ofs(data)));
+ }
- asn1_free(data);
+ asn1_free(data);
+ }
return ret;
}