New upstream release 0.2.3.
This commit is contained in:
parent
9c039d67f2
commit
6e0dc460ae
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/gssproxy-0.2.0.tar.gz
|
||||
/gssproxy-0.2.1.tar.gz
|
||||
/gssproxy-0.2.2.tar.gz
|
||||
/gssproxy-0.2.3.tar.gz
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 4ceed9a85484bdde3d355d21ceb666dc8d910910 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gdeschner@redhat.com>
|
||||
Date: Wed, 22 May 2013 17:26:00 +0200
|
||||
Subject: [PATCH] Fix realloc size in gp_get_cred_environment().
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This fixes a segfault when no client_keytab is passed in via cred_store api.
|
||||
See https://fedorahosted.org/gss-proxy/ticket/85 for details.
|
||||
|
||||
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
|
||||
Reviewed-by: Simo Sorce <simo@redhat.com>
|
||||
---
|
||||
proxy/src/gp_creds.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/proxy/src/gp_creds.c b/proxy/src/gp_creds.c
|
||||
index 0dd54f0..2517665 100644
|
||||
--- a/proxy/src/gp_creds.c
|
||||
+++ b/proxy/src/gp_creds.c
|
||||
@@ -292,7 +292,8 @@ static int gp_get_cred_environment(struct gp_service *svc,
|
||||
} else {
|
||||
gss_key_value_element_desc *t;
|
||||
c = cs->count;
|
||||
- t = realloc(cs->elements, c + 1);
|
||||
+ t = realloc(cs->elements,
|
||||
+ (c + 1) * sizeof(gss_key_value_element_desc));
|
||||
if (!t) {
|
||||
ret = ENOMEM;
|
||||
goto done;
|
||||
@@ -304,7 +305,7 @@ static int gp_get_cred_environment(struct gp_service *svc,
|
||||
goto done;
|
||||
}
|
||||
|
||||
- /* increment now so in case of failure to opy the value, key is
|
||||
+ /* increment now so in case of failure to copy the value, key is
|
||||
* still freed properly */
|
||||
cs->count = c + 1;
|
||||
cs->elements[c].value = strdup(cs->elements[k_num].value);
|
||||
--
|
||||
1.8.1.4
|
||||
|
@ -1,31 +0,0 @@
|
||||
From df40fa2e840e6a1f1ad32343fa39724409431067 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gdeschner@redhat.com>
|
||||
Date: Wed, 29 May 2013 15:58:34 +0200
|
||||
Subject: [PATCH] systemd: Make sure we start before nfs-secure services.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
They might want to use gssproxy so we need to run in advance.
|
||||
|
||||
Signed-off-by: Günther Deschner <gdeschner@redhat.com>
|
||||
Reviewed-by: Simo Sorce <simo@redhat.com>
|
||||
---
|
||||
proxy/systemd/gssproxy.service.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/proxy/systemd/gssproxy.service.in b/proxy/systemd/gssproxy.service.in
|
||||
index 8c0be48..950d8ae 100644
|
||||
--- a/proxy/systemd/gssproxy.service.in
|
||||
+++ b/proxy/systemd/gssproxy.service.in
|
||||
@@ -2,6 +2,7 @@
|
||||
Description=GSSAPI Proxy Daemon
|
||||
# GSSPROXY will not be started until syslog is
|
||||
After=syslog.target
|
||||
+Before=nfs-secure.service nfs-secure-server.service
|
||||
|
||||
[Service]
|
||||
ExecStart=@sbindir@/gssproxy -D
|
||||
--
|
||||
1.8.1.4
|
||||
|
@ -1,5 +1,5 @@
|
||||
Name: gssproxy
|
||||
Version: 0.2.2
|
||||
Version: 0.2.3
|
||||
Release: 5%{?dist}
|
||||
Summary: GSSAPI Proxy
|
||||
|
||||
@ -8,8 +8,6 @@ License: MIT
|
||||
URL: http://fedorahosted.org/gss-proxy
|
||||
Source0: http://fedorahosted.org/released/gss-proxy/%{name}-%{version}.tar.gz
|
||||
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
|
||||
Patch0: gssproxy-cred_store.patch
|
||||
Patch1: gssproxy-systemd.patch
|
||||
|
||||
%global servicename gssproxy
|
||||
%global pubconfpath %{_sysconfdir}/gssproxy
|
||||
@ -54,9 +52,6 @@ A proxy for GSSAPI credential handling
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p2 -b .cred_store
|
||||
%patch1 -p2 -b .systemd
|
||||
|
||||
%build
|
||||
autoreconf -f -i
|
||||
%configure \
|
||||
@ -108,6 +103,9 @@ rm -rf %{buildroot}
|
||||
%systemd_postun_with_restart gssproxy.service
|
||||
|
||||
%changelog
|
||||
* Thu Jun 06 2013 Guenther Deschner <gdeschner@redhat.com> 0.2.3-5
|
||||
- New upstream release
|
||||
|
||||
* Fri May 31 2013 Guenther Deschner <gdeschner@redhat.com> 0.2.2-5
|
||||
- Require libverto-tevent to make sure libverto initialization succeeds
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user