rpms/gssproxy
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixup previous commit

Browse Source
This commit is contained in:
Robbie Harwood 2017-12-12 13:09:50 -05:00
parent 3a1e8d7501
commit 8e054c1084
24 changed files with 43 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Add-Client-ID-to-debug-messages.patch
View File

@ -1,4 +1,4 @@
From 69ea98209aa691adec6fae5eb9287b96031094af Mon Sep 17 00:00:00 2001
From 9e9b8597c09605438a6d880b6df5aaa4696f4b21 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 25 May 2017 15:22:37 -0400
Subject: [PATCH] Add Client ID to debug messages

2
Do-not-call-gpm_grab_sock-twice.patch
View File

@ -1,4 +1,4 @@
From 73d0fc64966c553848a01f76894d33d9fc64cf20 Mon Sep 17 00:00:00 2001
From 32578afb817f20446d888326814b52a8f3d6c0fe Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 26 Oct 2017 16:59:18 -0400
Subject: [PATCH] Do not call gpm_grab_sock() twice

2
Emit-debug-on-queue-errors.patch
View File

@ -1,4 +1,4 @@
From d7923c5f4c6e93fa0e7440b1c8e6fcff40578a76 Mon Sep 17 00:00:00 2001
From 25ad523713559f8c875377383ffbd6f7b367d95e Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@redhat.com>
Date: Thu, 26 Oct 2017 11:47:54 -0400
Subject: [PATCH] Emit debug on queue errors

6
Fix-error-handling-in-gp_config_from_dir.patch
View File

@ -1,4 +1,4 @@
From 18050b40df25bb3486d0f12d6a830a15cb307298 Mon Sep 17 00:00:00 2001
From 8603c619ca9bc923534d83ee432ddd756f285d4c Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Wed, 12 Jul 2017 09:26:52 -0400
Subject: [PATCH] Fix error handling in gp_config_from_dir
@ -13,10 +13,10 @@ Merges: #204
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index efd97e4..2e9806d 100644
index 8fd60a3..07f7c8d 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -799,17 +799,21 @@ static int gp_config_from_dir(const char *config_dir,
@@ -798,17 +798,21 @@ static int gp_config_from_dir(const char *config_dir,
&error_list,
NULL);
if (ret) {

2
Fix-error-handling-in-gpm_send_buffer-gpm_recv_buffe.patch
View File

@ -1,4 +1,4 @@
From bbfb9a81f3bd7f3d6739c7eb24e08189fde6142f Mon Sep 17 00:00:00 2001
From accc0e772b126d251ca853a080b25466ebc528a3 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <alexander.m.scheel@gmail.com>
Date: Thu, 14 Sep 2017 11:24:39 -0500
Subject: [PATCH] Fix error handling in gpm_send_buffer/gpm_recv_buffer

6
Fix-error-message-handling-in-gp_config_from_dir.patch
View File

@ -1,4 +1,4 @@
From 3e4c98d74352fe3a08b23e438c950af55eb4f30e Mon Sep 17 00:00:00 2001
From 298fb49c32d9bf709f14445c1848a3b2419cd3fd Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 27 Oct 2017 14:39:35 -0400
Subject: [PATCH] Fix error message handling in gp_config_from_dir()
@ -17,10 +17,10 @@ Signed-off-by: Robbie Harwood <rharwood@redhat.com>
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index 3ec4b82..aa108ca 100644
index cd057a0..cb13b46 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -799,20 +799,23 @@ static int gp_config_from_dir(const char *config_dir,
@@ -798,20 +798,23 @@ static int gp_config_from_dir(const char *config_dir,
&error_list,
NULL);
if (error_list) {

2
Fix-handling-of-non-EPOLLIN-EPOLLOUT-events.patch
View File

@ -1,4 +1,4 @@
From 29be3e629bafb3bd796455b34c2de16492ad9521 Mon Sep 17 00:00:00 2001
From 8e9756f3cf0d03e5ca43f5212e3d4245ad1d9a00 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <alexander.m.scheel@gmail.com>
Date: Thu, 14 Sep 2017 11:16:42 -0500
Subject: [PATCH] Fix handling of non-EPOLLIN/EPOLLOUT events

12
Fix-most-memory-leaks.patch
View File

@ -1,4 +1,4 @@
From fae905d25a24dd360c5ae3e50bd3bfcf71c5f3bb Mon Sep 17 00:00:00 2001
From 9f9ab1e13c72b7c1fd06b6ba085ba2853bb9c3ca Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Thu, 29 Jun 2017 10:59:46 -0400
Subject: [PATCH] Fix most memory leaks
@ -9,26 +9,26 @@ Reviewed-by: Robbie Harwood <rharwood@redhat.com>
Merges: #203
Related: #176
(cherry picked from commit 470cf4d745d57f0597124a35b2faf86ba1107bb5)
[rharwood@redhat.com: backport around missing program support]
---
proxy/src/gp_config.c | 2 ++
proxy/src/gp_config.c | 1 +
proxy/src/gp_creds.c | 2 ++
proxy/src/gp_export.c | 3 ++-
proxy/src/gp_rpc_acquire_cred.c | 17 ++++++++++------
proxy/src/gssproxy.c | 42 ++++++++++++++++++++++++++++------------
proxy/src/mechglue/gpp_context.c | 2 ++
proxy/tests/t_acquire.c | 3 +++
7 files changed, 52 insertions(+), 19 deletions(-)
7 files changed, 51 insertions(+), 19 deletions(-)
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index a671333..754edf5 100644
index a671333..b4ab90c 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -75,6 +75,8 @@ static void gp_service_free(struct gp_service *svc)
@@ -75,6 +75,7 @@ static void gp_service_free(struct gp_service *svc)
free_cred_store_elements(&svc->krb5.store);
gp_free_creds_handle(&svc->krb5.creds_handle);
}
+ free(svc->socket);
+ free(svc->program);
SELINUX_context_free(svc->selinux_ctx);
memset(svc, 0, sizeof(struct gp_service));
}

2
Fix-potential-free-of-non-heap-address.patch
View File

@ -1,4 +1,4 @@
From ab123e89f29965a9cb0ca40a4dcdd538b6feb285 Mon Sep 17 00:00:00 2001
From 9c35e3e40f63e3bc98c258810abd422e5149d0ee Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 11 Sep 2017 10:52:03 -0400
Subject: [PATCH] Fix potential free of non-heap address

6
Fix-segfault-when-no-config-files-are-present.patch
View File

@ -1,4 +1,4 @@
From 43033ca39d12d5e4884736cca46fec894f7cb1e9 Mon Sep 17 00:00:00 2001
From 76954aa028a897021a9bdcb0a1b5249e2652f7b6 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 16 May 2017 14:16:23 -0400
Subject: [PATCH] Fix segfault when no config files are present
@ -13,10 +13,10 @@ Merges: #185
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index 754edf5..efd97e4 100644
index b4ab90c..8fd60a3 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -845,16 +845,17 @@ int gp_config_init(const char *config_file, const char *config_dir,
@@ -844,16 +844,17 @@ int gp_config_init(const char *config_file, const char *config_dir,
if (config_file) {
ret = gp_config_from_file(config_file, ini_config, collision_flags);

12
Fix-silent-crash-with-duplicate-config-sections.patch
View File

@ -1,4 +1,4 @@
From 11c8ef2857810116fe04cf2a5de643af0fa9c475 Mon Sep 17 00:00:00 2001
From caec174b203206185b6075c0e822c6f45070dd87 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Wed, 9 Aug 2017 15:00:26 -0400
Subject: [PATCH] Fix silent crash with duplicate config sections
@ -150,10 +150,10 @@ index c52dbb6..9e01f7d 100644
LIBS="$PTHREAD_LIBS $LIBS"
diff --git a/proxy/src/gp_config.c b/proxy/src/gp_config.c
index 2e9806d..3ec4b82 100644
index 07f7c8d..cd057a0 100644
--- a/proxy/src/gp_config.c
+++ b/proxy/src/gp_config.c
@@ -729,7 +729,7 @@ static int gp_config_from_file(const char *config_file,
@@ -728,7 +728,7 @@ static int gp_config_from_file(const char *config_file,
0, /* metadata_flags, FIXME */
&file_ctx);
if (ret) {
@ -162,7 +162,7 @@ index 2e9806d..3ec4b82 100644
ret, gp_strerror(ret));
ini_config_destroy(ini_config);
return ret;
@@ -743,7 +743,7 @@ static int gp_config_from_file(const char *config_file,
@@ -742,7 +742,7 @@ static int gp_config_from_file(const char *config_file,
if (ret) {
char **errors = NULL;
/* we had a parsing failure */
@ -171,7 +171,7 @@ index 2e9806d..3ec4b82 100644
ret, gp_strerror(ret));
if (ini_config_error_count(ini_config)) {
ini_config_get_errors(ini_config, &errors);
@@ -792,26 +792,25 @@ static int gp_config_from_dir(const char *config_dir,
@@ -791,26 +791,25 @@ static int gp_config_from_dir(const char *config_dir,
INI_STOP_ON_ANY, /* error_level */
collision_flags,
INI_PARSE_NOWRAP,
@ -207,7 +207,7 @@ index 2e9806d..3ec4b82 100644
ref_array_destroy(error_list);
return ret;
@@ -822,9 +821,7 @@ static int gp_config_from_dir(const char *config_dir,
@@ -821,9 +820,7 @@ static int gp_config_from_dir(const char *config_dir,
ini_config_destroy(*ini_config);
*ini_config = result_cfg;
}

2
Handle-outdated-encrypted-ccaches.patch
View File

@ -1,4 +1,4 @@
From d78394bcdee27ee2ec00822871a7688585d6e9ed Mon Sep 17 00:00:00 2001
From 044f2224ca5c86b51b2f2ce2878ede9e236e41d3 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 15 Sep 2017 18:07:28 -0400
Subject: [PATCH] Handle outdated encrypted ccaches

2
Include-header-for-writev.patch
View File

@ -1,4 +1,4 @@
From 2e09eacffcf9750010b4d4a9aa7a518cdd267cfc Mon Sep 17 00:00:00 2001
From 3b912a01fa9b483fbbf3ef91df061bc5bc0c0db0 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 17 May 2017 12:21:37 -0400
Subject: [PATCH] Include header for writev()

2
Only-empty-FILE-ccaches-when-storing-remote-creds.patch
View File

@ -1,4 +1,4 @@
From dc8697b0c43007167c7054ceff84b6cc9c10fccf Mon Sep 17 00:00:00 2001
From f2d1472f1557ceee70f2eaacf790c0222a36c4a1 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 10 Oct 2017 18:00:45 -0400
Subject: [PATCH] Only empty FILE ccaches when storing remote creds

2
Prevent-uninitialized-read-in-error-path-of-XDR-cont.patch
View File

@ -1,4 +1,4 @@
From b7a3229b3314a58076c9ab6ce72a47fb16b9e162 Mon Sep 17 00:00:00 2001
From 7b7de309a059ab1f770f9a1192be9299ab0e38f2 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 12 Sep 2017 12:40:27 -0400
Subject: [PATCH] Prevent uninitialized read in error path of XDR contexts

2
Properly-initialize-ccaches-before-storing-into-them.patch
View File

@ -1,4 +1,4 @@
From 573f03013df1673ba2e31180ab28a86564e02da5 Mon Sep 17 00:00:00 2001
From 7a343088a7b716532b1b5c32965fa9ef02c1987a Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 5 Dec 2017 13:14:29 -0500
Subject: [PATCH] Properly initialize ccaches before storing into them

2
Properly-locate-credentials-in-collection-caches-in-.patch
View File

@ -1,4 +1,4 @@
From 87c96790b127cdcd90d61cdd0d638780d28035c8 Mon Sep 17 00:00:00 2001
From 51721282ae021e57888b38720a4acd69e88a8f4f Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 20 Nov 2017 14:09:04 -0500
Subject: [PATCH] Properly locate credentials in collection caches in mechglue

2
Separate-cred-and-ccache-manipulation-in-gpp_store_r.patch
View File

@ -1,4 +1,4 @@
From 12383b4f01cfa8551d35ba9f483290c2861a5822 Mon Sep 17 00:00:00 2001
From dfddf297c5876d9a5764a83aa7d436b8df020af9 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 17 Nov 2017 13:53:37 -0500
Subject: [PATCH] Separate cred and ccache manipulation in

2
Simplify-setting-NONBLOCK-on-socket.patch
View File

@ -1,4 +1,4 @@
From 47702eef23a4a6b97d326a76f6569bd571b4abdf Mon Sep 17 00:00:00 2001
From 4a857676879caa636ccbb3fb5c4601fff8afdee0 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <alexander.m.scheel@gmail.com>
Date: Thu, 14 Sep 2017 10:57:12 -0500
Subject: [PATCH] Simplify setting NONBLOCK on socket

2
Tolerate-NULL-pointers-in-gp_same.patch
View File

@ -1,4 +1,4 @@
From f5d3edc57941ed2e10b9e4458c19772577dc2aa8 Mon Sep 17 00:00:00 2001
From ea57f8351e8f1ec2ed4a628b5c235498e65fba0f Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Tue, 13 Jun 2017 14:22:44 -0400
Subject: [PATCH] Tolerate NULL pointers in gp_same

2
Update-systemd-file.patch
View File

@ -1,4 +1,4 @@
From 08d63fdf7c305965579a2fea2db63597690f38d9 Mon Sep 17 00:00:00 2001
From 90d7a614b3eb451f0067dfacf0f0b6f41eb00180 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 26 Apr 2017 21:02:47 -0400
Subject: [PATCH] Update systemd file

2
client-Switch-to-non-blocking-sockets.patch
View File

@ -1,4 +1,4 @@
From 4e551526d3400b09bfb8a16457c715378cb34edb Mon Sep 17 00:00:00 2001
From 3d08f71f576a381955f07a91198f5dcb320026ba Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Wed, 2 Aug 2017 15:11:49 -0400
Subject: [PATCH] [client] Switch to non-blocking sockets

5
gssproxy.spec
View File

@ -1,6 +1,6 @@
Name: gssproxy
Version: 0.7.0
Release: 27%{?dist}
Release: 28%{?dist}
Summary: GSSAPI Proxy
Group: System Environment/Libraries
@ -145,6 +145,9 @@ rm -rf %{buildroot}
%systemd_postun_with_restart gssproxy.service
%changelog
* Tue Dec 12 2017 Robbie Harwood <rharwood@redhat.com> - 0.7.0-28
- Fixup previous
* Tue Dec 12 2017 Robbie Harwood <rharwood@redhat.com> - 0.7.0-27
- More code hygeine fixes from upstream
- Reorder patches to match el7

2
server-Add-detailed-request-logging.patch
View File

@ -1,4 +1,4 @@
From 0311d4c0a4305d6e85d937f5ba2b83c8cf5e53e3 Mon Sep 17 00:00:00 2001
From a45cb6a67530fe2224e2aaeb73808f9e1e99bfa9 Mon Sep 17 00:00:00 2001
From: Alexander Scheel <ascheel@redhat.com>
Date: Fri, 4 Aug 2017 16:09:20 -0400
Subject: [PATCH] [server] Add detailed request logging