Attachment 11892 Details for Bug 11702 – patch for 4.4

[patch] patch for 4.4

bug-11702-v4-4.patches.txt (text/plain), 1.44 KB, created by Karolin Seeger on 2016-03-03 10:34:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Karolin Seeger

Created: 2016-03-03 10:34:17 UTC

Size: 1.44 KB

patch

obsolete

>From b874858c3beb9776ed80aee5509757c00a8ceac8 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Thu, 28 Jan 2016 15:50:06 +0100
>Subject: [PATCH] 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>
>(cherry picked from commit 14f1a94b6fb3a55be1e60fe0d28740f04fd94b3f)
>---
> source3/libsmb/clispnego.c | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/source3/libsmb/clispnego.c b/source3/libsmb/clispnego.c
>index 3300c85..82f13b7 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;
> }
>-- 
>1.9.1
>

Flags:

vl: review+

Actions: View

Attachments on bug 11702: 11891 | 11892