From: Greg Hudson <ghudson@mit.edu>
Date: Sun, 8 Jul 2012 04:31:59 +0000 (-0400)
Subject: Avoid mapping GSSAPI minor code on success
X-Git-Tag: kfw-4.0-final~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1aa612166964feb91a09c852987a36d1694cd1d;p=thirdparty%2Fkrb5.git

Avoid mapping GSSAPI minor code on success

In gssint_import_internal_name, don't map the minor code from
mech->gss_duplicate_name if it returned successfully.  Fixes an
"unexpected non-zero minor status" error reported by SAP's gsstest
when it invokes gss_canonicalize_name().

(cherry picked from commit a02fcceeaeab1441d815255d569aaa6c193c2725)

ticket: 7194
version_fixed: 1.10.4
status: resolved
---

diff --git a/src/lib/gssapi/mechglue/g_glue.c b/src/lib/gssapi/mechglue/g_glue.c
index 20485239e1..a9b6f3502f 100644
--- a/src/lib/gssapi/mechglue/g_glue.c
+++ b/src/lib/gssapi/mechglue/g_glue.c
@@ -375,7 +375,8 @@ gss_name_t	*internal_name;
 					  union_name->mech_name,
 					  internal_name);
 	if (status != GSS_S_UNAVAILABLE) {
-	    map_error(minor_status, mech);
+	    if (status != GSS_S_COMPLETE)
+		map_error(minor_status, mech);
 	    return (status);
 	}
     }