[30441] in CVS-changelog-for-Kerberos-V5
krb5 commit: Properly size #ifdef in k5_cccol_lock()
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Feb 15 22:58:23 2019
Date: Fri, 15 Feb 2019 22:58:18 -0500
From: Greg Hudson <ghudson@mit.edu>
Message-ID: <201902160358.x1G3wIL2031861@drugstore.mit.edu>
To: <cvs-krb5@mit.edu>
MIME-Version: 1.0
Reply-To: krbdev@mit.edu
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/444a15f9cf82b9a6c1bca3f20307f82fee91c228
commit 444a15f9cf82b9a6c1bca3f20307f82fee91c228
Author: Robbie Harwood <rharwood@redhat.com>
Date: Thu Feb 14 11:50:35 2019 -0500
Properly size #ifdef in k5_cccol_lock()
The cleanup code only could get executed in the USE_CCAPI_V3 case, so
move it inside that block. Reported by Coverity.
src/lib/krb5/ccache/ccbase.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/lib/krb5/ccache/ccbase.c b/src/lib/krb5/ccache/ccbase.c
index 6715ac9..f53ba50 100644
--- a/src/lib/krb5/ccache/ccbase.c
+++ b/src/lib/krb5/ccache/ccbase.c
@@ -511,7 +511,6 @@ k5_cccol_lock(krb5_context context)
#endif
#ifdef USE_CCAPI_V3
ret = krb5_stdccv3_context_lock(context);
-#endif
if (ret) {
k5_cc_mutex_unlock(context, &krb5int_mcc_mutex);
k5_cc_mutex_unlock(context, &krb5int_cc_file_mutex);
@@ -519,6 +518,7 @@ k5_cccol_lock(krb5_context context)
k5_cc_mutex_unlock(context, &cccol_lock);
return ret;
}
+#endif
k5_mutex_unlock(&cc_typelist_lock);
return ret;
}
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
