summaryrefslogtreecommitdiffstats
path: root/kadmin.service
diff options
context:
space:
mode:
authorNalin Dahyabhai <nalin@dahyabhai.net>2013-08-15 00:10:24 -0400
committerNalin Dahyabhai <nalin@dahyabhai.net>2013-08-15 00:10:24 -0400
commitee18500d9bf63fedace5dea8d090156e640e51e3 (patch)
tree17c239766f0816c5dad528dfd1dd4ee4e0d70415 /kadmin.service
parent272aaeef1761d45e75a9524ea5e3003d1575f975 (diff)
downloadkrb5-ee18500d9bf63fedace5dea8d090156e640e51e3.tar.gz
krb5-ee18500d9bf63fedace5dea8d090156e640e51e3.tar.xz
krb5-ee18500d9bf63fedace5dea8d090156e640e51e3.zip
Fix error detection when starting kpropd/kadmindkrb5-1.11.3-8.fc20krb5-1.11.3-8.fc19
- drop a patch we're not applying - wrap kadmind and kpropd in scripts which check for the presence/absence of files which dictate particular exit codes before exec'ing the actual binaries, instead of trying to use ConditionPathExists in the unit files to accomplish that, so that we exit with failure properly when what we expect isn't actually in effect on the system (#800343)
Diffstat (limited to 'kadmin.service')
-rw-r--r--kadmin.service3
1 files changed, 1 insertions, 2 deletions
diff --git a/kadmin.service b/kadmin.service
index 7775ea7..ede159e 100644
--- a/kadmin.service
+++ b/kadmin.service
@@ -1,13 +1,12 @@
[Unit]
Description=Kerberos 5 Password-changing and Administration
After=syslog.target network.target
-ConditionPathExists=!/var/kerberos/krb5kdc/kpropd.acl
[Service]
Type=forking
PIDFile=/var/run/kadmind.pid
EnvironmentFile=-/etc/sysconfig/kadmin
-ExecStart=/usr/sbin/kadmind -P /var/run/kadmind.pid $KADMIND_ARGS
+ExecStart=/usr/sbin/_kadmind -P /var/run/kadmind.pid $KADMIND_ARGS
ExecReload=/bin/kill -HUP $MAINPID
[Install]