walters / rpms / nfs-utils

Forked from rpms/nfs-utils 6 years ago
Clone
689375a
commit a705076172b274463563416adffe55f129740267
689375a
Author: Steve Dickson <steved@redhat.com>
689375a
Date:   Thu Jul 30 17:06:39 2015 -0400
689375a
689375a
    rpc.gssd: Only clear the retval if it has not been set
689375a
    
689375a
    In gssd_search_krb5_keytab() an error code can be
689375a
    cleared by blindly setting retval to zero.
689375a
    
689375a
    Reported-by: Jianhong Yin <jiyin@redhat.com>
689375a
    Signed-off-by: Steve Dickson <steved@redhat.com>
689375a
689375a
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
689375a
index f1ebc0d..ecf17a2 100644
689375a
--- a/utils/gssd/krb5_util.c
689375a
+++ b/utils/gssd/krb5_util.c
689375a
@@ -772,7 +772,9 @@ gssd_search_krb5_keytab(krb5_context context, krb5_keytab kt,
689375a
 			    "keytab '%s'\n", k5err, kt_name);
689375a
 	}
689375a
 
689375a
-	retval = 0;
689375a
+	/* Only clear the retval if has not been set */
689375a
+	if (retval < 0)
689375a
+		retval = 0;
689375a
   out:
689375a
 	free(k5err);
689375a
 	return retval;