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

Document config file non-merging

Browse Source
This commit is contained in:
Robbie Harwood 2020-10-12 13:46:35 -04:00
parent 7e62249bff
commit eb409610a9
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Document-config-file-non-merging.patch Normal file
View File

@ -0,0 +1,29 @@
From 2592d32c5c6d39f30dc0bfdb78b5c292ed0af2ae Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 10 Jun 2020 15:50:36 -0400
Subject: [PATCH] Document config file non-merging
Merges: #4
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
Reviewed-by: Simo Sorce <simo@redhat.com>
(cherry picked from commit a05b876badd52ba99d95c981f5f8b0e50de28c63)
---
man/gssproxy.conf.5.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/man/gssproxy.conf.5.xml b/man/gssproxy.conf.5.xml
index 04059a8..5e240ab 100644
--- a/man/gssproxy.conf.5.xml
+++ b/man/gssproxy.conf.5.xml
@@ -37,7 +37,10 @@
of the form "##-foo.conf" (that is, start with two numbers
followed by a dash, and end in ".conf"). Files not conforming to
this will be ignored unless specifically requested through command
- line parameters.
+ line parameters. Within a single file, any duplicate values or
+ sections will be merged. Across multiple files, duplicates will
+ generate a warning, and the first value encountered will take
+ precedence (i.e., there is no merging).
</para>
</refsect1>

6
gssproxy.spec
View File

@ -1,7 +1,7 @@
Name: gssproxy
Version: 0.8.3
Release: 4%{?dist}
Release: 5%{?dist}
Summary: GSSAPI Proxy
License: MIT
@ -12,6 +12,7 @@ Source1: rwtab
Patch0: Initialize-our-epoll_event-structures.patch
Patch1: Avoid-leak-of-special-mechs-in-gss_mech_interposer.patch
Patch2: Fix-leak-of-mech-OID-in-gssi_inquire_context.patch
Patch3: Document-config-file-non-merging.patch
%global servicename gssproxy
%global pubconfpath %{_sysconfdir}/gssproxy
@ -113,6 +114,9 @@ install -m644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/rwtab.d/gssproxy
%systemd_postun_with_restart gssproxy.service
%changelog
* Mon Oct 12 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.3-5
- Document config file non-merging
* Wed Aug 26 2020 Robbie Harwood <rharwood@redhat.com> - 0.8.3-4
- Fix leak of mech OID in gssi_inquire_context()