From 0018969f7814d95abe6a1eda40218fd374b064fa Mon Sep 17 00:00:00 2001 From: Kinglong Mee Date: Wed, 20 Jul 2016 10:56:50 -0400 Subject: Gssd: Avoid compiling warning and simplify codes krb5_util.c: In function gssd_acquire_user_cred: krb5_util.c:1389:4: warning: this if clause does not guard... Signed-off-by: Kinglong Mee Signed-off-by: Steve Dickson --- utils/gssd/krb5_util.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index c1e4d2b..b64818a 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -1380,17 +1380,17 @@ gssd_acquire_user_cred(gss_cred_id_t *gss_cred) int ret; ret = gssd_acquire_krb5_cred(gss_cred); + if (ret) + return ret; /* force validation of cred to check for expiry */ - if (ret == 0) { - maj_stat = gss_inquire_cred(&min_stat, *gss_cred, + maj_stat = gss_inquire_cred(&min_stat, *gss_cred, NULL, NULL, NULL, NULL); - if (maj_stat != GSS_S_COMPLETE) { - if (get_verbosity() > 0) - pgsserr("gss_inquire_cred", - maj_stat, min_stat, &krb5oid); - ret = -1; - } + if (maj_stat != GSS_S_COMPLETE) { + if (get_verbosity() > 0) + pgsserr("gss_inquire_cred", + maj_stat, min_stat, &krb5oid); + ret = -1; } return ret; -- cgit