summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKinglong Mee <kinglongmee@gmail.com>2016-07-20 10:56:50 -0400
committerSteve Dickson <steved@redhat.com>2016-07-20 11:12:10 -0400
commit0018969f7814d95abe6a1eda40218fd374b064fa (patch)
tree7a27e8454bac60805300df3929327f5249b9d952
parent5107d06ad9eac68bcc6f0f85341e0e1cc5e67213 (diff)
downloadnfs-utils-0018969f7814d95abe6a1eda40218fd374b064fa.tar.gz
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 <kinglongmee@gmail.com> Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r--utils/gssd/krb5_util.c16
1 files 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;