summaryrefslogtreecommitdiffstats
path: root/ipaserver
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2011-07-20 18:11:05 -0400
committerSimo Sorce <ssorce@redhat.com>2011-08-26 08:26:08 -0400
commitdfa944da247f71f4ccf8a18eee30459e6c25caa5 (patch)
treea0734aaade4426e61f24e4a026b6c6f47ce30305 /ipaserver
parenta60a71497bb412217922b00d0e8398bfc3e6a9db (diff)
downloadfreeipa-dfa944da247f71f4ccf8a18eee30459e6c25caa5.tar.gz
freeipa-dfa944da247f71f4ccf8a18eee30459e6c25caa5.tar.xz
freeipa-dfa944da247f71f4ccf8a18eee30459e6c25caa5.zip
daemons: Remove ipa_kpasswd
Now that we have our own database we can properly enforce stricter constraints on how the db can be changed. Stop shipping our own kpasswd daemon and instead use the regular kadmin daemon.
Diffstat (limited to 'ipaserver')
-rw-r--r--ipaserver/install/krbinstance.py2
-rw-r--r--ipaserver/install/service.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 7f77fc1eb..9956b9fb7 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -71,7 +71,7 @@ def update_key_val_in_file(filename, key, val):
class KpasswdInstance(service.SimpleServiceInstance):
def __init__(self):
- service.SimpleServiceInstance.__init__(self, "ipa_kpasswd")
+ service.SimpleServiceInstance.__init__(self, "kadmin")
class KrbInstance(service.Service):
def __init__(self, fstore=None):
diff --git a/ipaserver/install/service.py b/ipaserver/install/service.py
index 62db9baf5..2f80749ad 100644
--- a/ipaserver/install/service.py
+++ b/ipaserver/install/service.py
@@ -34,7 +34,7 @@ CACERT = "/etc/ipa/ca.crt"
SERVICE_LIST = {
'KDC':('krb5kdc', 10),
- 'KPASSWD':('ipa_kpasswd', 20),
+ 'KPASSWD':('kadmin', 20),
'DNS':('named', 30),
'HTTP':('httpd', 40),
'CA':('pki-cad', 50)