Exit with status 0 from kadmind
This commit is contained in:
parent
5f3f6ef19b
commit
ed142b51b1
31
Exit-with-status-0-from-kadmind.patch
Normal file
31
Exit-with-status-0-from-kadmind.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From a4576a5946d84e1a74093c4fc171a7fcb1f7ef59 Mon Sep 17 00:00:00 2001
|
||||
From: Robbie Harwood <rharwood@redhat.com>
|
||||
Date: Wed, 14 Mar 2018 14:31:22 -0400
|
||||
Subject: [PATCH] Exit with status 0 from kadmind
|
||||
|
||||
Typically, 0 denotes successful exit. In particular, init systems
|
||||
will complain if another different value is returned. This presents a
|
||||
problem for automated installation jobs which want to restart kadmind.
|
||||
|
||||
`service kadmin stop` typically sends SIGTERM, which is caught by
|
||||
verto and passed to our handler. Besides cleanup, we then call
|
||||
verto_break(), which causes the verto_run() event loop to return. The
|
||||
weird return code has been present since the addition of the kadmin
|
||||
code, which used a similar event model for signals.
|
||||
|
||||
(cherry picked from commit f970ad412aca36f8a7d3addb1cd4026ed22e5592)
|
||||
---
|
||||
src/kadmin/server/ovsec_kadmd.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
|
||||
index 6c875901a..936955b89 100644
|
||||
--- a/src/kadmin/server/ovsec_kadmd.c
|
||||
+++ b/src/kadmin/server/ovsec_kadmd.c
|
||||
@@ -560,5 +560,5 @@ main(int argc, char *argv[])
|
||||
|
||||
krb5_klog_close(context);
|
||||
krb5_free_context(context);
|
||||
- exit(2);
|
||||
+ exit(0);
|
||||
}
|
@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
|
||||
Name: krb5
|
||||
Version: 1.16
|
||||
# for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
|
||||
# lookaside-cached sources; two downloads and a build artifact
|
||||
Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}%{prerelease}.tar.gz
|
||||
@ -64,6 +64,7 @@ Patch37: Process-included-directories-in-alphabetical-order.patch
|
||||
Patch38: Fix-flaws-in-LDAP-DN-checking.patch
|
||||
Patch39: Fix-capaths-.-values-on-client.patch
|
||||
Patch40: Fix-hex-conversion-of-PKINIT-certid-strings.patch
|
||||
Patch41: Exit-with-status-0-from-kadmind.patch
|
||||
|
||||
License: MIT
|
||||
URL: http://web.mit.edu/kerberos/www/
|
||||
@ -713,6 +714,9 @@ exit 0
|
||||
%{_libdir}/libkadm5srv_mit.so.*
|
||||
|
||||
%changelog
|
||||
* Wed Mar 14 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-10
|
||||
- Exit with status 0 from kadmind
|
||||
|
||||
* Tue Mar 13 2018 Robbie Harwood <rharwood@redhat.com> - 1.16-9
|
||||
- Fix hex conversion of PKINIT certid strings
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user