Actually apply the patches I just added
Also include a Coverity fix.
This commit is contained in:
parent
839072e3a8
commit
07be2820f2
29
Appease-Coverity.patch
Normal file
29
Appease-Coverity.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
From 03b76c1ca376d01622df7e599c9882b693054675 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robbie Harwood <rharwood@redhat.com>
|
||||||
|
Date: Mon, 27 Feb 2017 11:52:17 -0500
|
||||||
|
Subject: [PATCH] Appease Coverity
|
||||||
|
|
||||||
|
There is only one call site of gpp_store_remote_creds(), and it already checks
|
||||||
|
that `creds != NULL`, so we don't need to duplicate the check.
|
||||||
|
|
||||||
|
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
|
||||||
|
Reviewed-by: Simo Sorce <simo@redhat.com>
|
||||||
|
PR: #52
|
||||||
|
(cherry picked from commit 348d5df4864639ebe50bfeaabd8c423233da24d6)
|
||||||
|
---
|
||||||
|
proxy/src/mechglue/gpp_creds.c | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/proxy/src/mechglue/gpp_creds.c b/proxy/src/mechglue/gpp_creds.c
|
||||||
|
index 37517d6..8fcef36 100644
|
||||||
|
--- a/proxy/src/mechglue/gpp_creds.c
|
||||||
|
+++ b/proxy/src/mechglue/gpp_creds.c
|
||||||
|
@@ -20,8 +20,6 @@ uint32_t gpp_store_remote_creds(uint32_t *min,
|
||||||
|
|
||||||
|
*min = 0;
|
||||||
|
|
||||||
|
- if (creds == NULL) return GSS_S_CALL_INACCESSIBLE_READ;
|
||||||
|
-
|
||||||
|
memset(&cred, 0, sizeof(cred));
|
||||||
|
|
||||||
|
ret = krb5_init_context(&ctx);
|
@ -1,6 +1,6 @@
|
|||||||
Name: gssproxy
|
Name: gssproxy
|
||||||
Version: 0.6.2
|
Version: 0.6.2
|
||||||
Release: 2%{?dist}
|
Release: 4%{?dist}
|
||||||
Summary: GSSAPI Proxy
|
Summary: GSSAPI Proxy
|
||||||
|
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
@ -22,6 +22,7 @@ Patch4: Fix-incorrect-use-of-non-null-terminated-string.patch
|
|||||||
Patch5: Fix-another-incorrect-use-of-non-null-term.-string.patch
|
Patch5: Fix-another-incorrect-use-of-non-null-term.-string.patch
|
||||||
Patch6: Always-check-if-we-have-a-remote-credential.patch
|
Patch6: Always-check-if-we-have-a-remote-credential.patch
|
||||||
Patch7: Fix-asprintf-3-call-in-ensure_segregated_ccache.patch
|
Patch7: Fix-asprintf-3-call-in-ensure_segregated_ccache.patch
|
||||||
|
Patch8: Appease-Coverity.patch
|
||||||
|
|
||||||
### Dependencies ###
|
### Dependencies ###
|
||||||
Requires: krb5-libs >= 1.12.0
|
Requires: krb5-libs >= 1.12.0
|
||||||
@ -65,7 +66,15 @@ A proxy for GSSAPI credential handling
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p2 -b .Fix-incorrect-use-of-non-null-terminated-string
|
%patch0 -p2 -b .Clean-up-build-flags
|
||||||
|
%patch1 -p2 -b .Detect-kerberos.schema-on-RHEL
|
||||||
|
%patch2 -p2 -b .Fix-behavior-when-not-passed-config_dir-on-the-comma
|
||||||
|
%patch3 -p2 -b .Document-debug_level-option-in-gssproxy.conf-5
|
||||||
|
%patch4 -p2 -b .Fix-incorrect-use-of-non-null-terminated-string
|
||||||
|
%patch5 -p2 -b .Fix-another-incorrect-use-of-non-null-term.-string
|
||||||
|
%patch6 -p2 -b .Always-check-if-we-have-a-remote-credential
|
||||||
|
%patch7 -p2 -b .Fix-asprintf-3-call-in-ensure_segregated_ccache
|
||||||
|
%patch8 -p2 -b .Appease-Coverity
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf -f -i
|
autoreconf -f -i
|
||||||
@ -126,6 +135,13 @@ rm -rf %{buildroot}
|
|||||||
%systemd_postun_with_restart gssproxy.service
|
%systemd_postun_with_restart gssproxy.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 06 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.2-4
|
||||||
|
- TODO edit me
|
||||||
|
|
||||||
|
* Mon Mar 06 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.2-3
|
||||||
|
- Actually apply the patches I just added
|
||||||
|
- Also include a Coverity fix.
|
||||||
|
|
||||||
* Tue Feb 28 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.2-2
|
* Tue Feb 28 2017 Robbie Harwood <rharwood@redhat.com> - 0.6.2-2
|
||||||
- Include other non-null fix and various things from master
|
- Include other non-null fix and various things from master
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user