rpms/krb5
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- kadmin.service: fix #723723 again

Browse Source 
- kadmin.service,krb5kdc.service: remove optional use of $KRB5REALM in command
  lines, because systemd parsing doesn't handle alternate value shell variable
  syntax
- kprop.service: add missing Type=forking so that systemd doesn't assume simple
- kprop.service: expect the ACL configuration to be there, not absent
This commit is contained in:
Nalin Dahyabhai 2011-10-07 15:10:35 -04:00
parent e645180a9a
commit 098a308f7e
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kadmin.service
View File

@ -1,14 +1,13 @@
[Unit]
Description=Kerberos 5 Administrative Server
Description=Kerberos 5 Password-changing and Administration
After=syslog.target network.target
ConditionPathExists=/var/kerberos/krb5kdc/principal
ConditionPathExists=!/var/kerberos/krb5kdc/kpropd.acl
[Service]
Type=forking
PIDFile=/var/run/kadmind.pid
EnvironmentFile=-/etc/sysconfig/kadmin
ExecStart=/usr/sbin/kadmind -r $KRB5REALM -P /var/run/kadmind.pid $KADMIND_ARGS
ExecStart=/usr/sbin/kadmind -P /var/run/kadmind.pid $KADMIND_ARGS
ExecReload=/bin/kill -HUP $MAINPID
[Install]

1
kadmin.sysconfig
View File

@ -1,2 +1 @@
KADMIND_ARGS=
KRB5REALM=

8
kprop.service
View File

@ -1,11 +1,11 @@
[Unit]
Description=Kerberos 5 Propagation Client
Description=Kerberos 5 Propagation
After=syslog.target network.target
ConditionPathExists=!/var/kerberos/krb5kdc/kpropd.acl
ConditionPathExists=/var/kerberos/krb5kdc/kpropd.acl
[Service]
ExecStart=/usr/sbin/kpropd -S
Type=forking
ExecStart=/usr/sbin/kpropd -S
[Install]
WantedBy=multi-user.target

12
krb5.spec
View File

@ -699,6 +699,14 @@ exit 0
%{_sbindir}/uuserver
%changelog
* Fri Oct 7 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-16
- kadmin.service: fix #723723 again
- kadmin.service,krb5kdc.service: remove optional use of $KRB5REALM in command
lines, because systemd parsing doesn't handle alternate value shell variable
syntax
- kprop.service: add missing Type=forking so that systemd doesn't assume simple
- kprop.service: expect the ACL configuration to be there, not absent
* Sun Oct 2 2011 Tom Callaway <spot@fedoraproject.org> 1.9.1-15
- hardcode pid file as option in krb5kdc.service
@ -734,7 +742,9 @@ exit 0
way of Kevin Coffman
* Wed Jul 20 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-7
- kadmind.init: drop the attempt to detect no-database-present errors (#723723)
- kadmind.init: drop the attempt to detect no-database-present errors (#723723),
which is too fragile in cases where the database has been manually moved or
is accessed through another kdb plugin
* Tue Jul 19 2011 Nalin Dahyabhai <nalin@redhat.com> 1.9.1-6
- backport fixes to teach libkrb5 to use descriptors higher than FD_SETSIZE

5
krb5kdc.service
View File

@ -1,14 +1,13 @@
[Unit]
Description=Kerberos 5 Servers
Description=Kerberos 5 KDC
After=syslog.target network.target
[Service]
Type=forking
PIDFile=/var/run/krb5kdc.pid
EnvironmentFile=-/etc/sysconfig/krb5kdc
ExecStart=/usr/sbin/krb5kdc -r $KRB5REALM -P /var/run/krb5kdc.pid $KRB5KDC_ARGS
ExecStart=/usr/sbin/krb5kdc -P /var/run/krb5kdc.pid $KRB5KDC_ARGS
ExecReload=/bin/kill -HUP $MAINPID
[Install]
WantedBy=multi-user.target

1
krb5kdc.sysconfig
View File

@ -1,2 +1 @@
KRB5KDC_ARGS=
KRB5REALM=