krb5 commit [krb5-1.10]: krb5_stdccv3_get_principal error handling fixup

Tom Yu tlyu at MIT.EDU
Mon Jul 23 16:26:28 EDT 2012


https://github.com/krb5/krb5/commit/c66999de63a97eb1f628fe7b867553874cd56d20
commit c66999de63a97eb1f628fe7b867553874cd56d20
Author: Kevin Wasserman <kevin.wasserman at painless-security.com>
Date:   Sun May 6 17:50:20 2012 -0400

    krb5_stdccv3_get_principal error handling fixup
    
    Don't treat an error returned by krb5_parse_name as a cc-internal error.
    
    Signed-off-by: Kevin Wasserman <kevin.wasserman at painless-security.com>
    
    (cherry picked from commit fbe77b2c7d4340097690cbed7b48fd9888feacd4)
    
    ticket: 7214
    version_fixed: 1.10.3
    status: resolved

 src/lib/krb5/ccache/ccapi/stdcc.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/lib/krb5/ccache/ccapi/stdcc.c b/src/lib/krb5/ccache/ccapi/stdcc.c
index d361bde..fa6a1d4 100644
--- a/src/lib/krb5/ccache/ccapi/stdcc.c
+++ b/src/lib/krb5/ccache/ccapi/stdcc.c
@@ -764,11 +764,13 @@ krb5_stdccv3_get_principal (krb5_context context,
 
     if (!err) {
         err = krb5_parse_name (context, name->data, princ);
+    } else {
+        err = cc_err_xlate (err);
     }
 
     if (name) { cc_string_release (name); }
 
-    return cc_err_xlate (err);
+    return err;
 }
 
 /*


More information about the cvs-krb5 mailing list