summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/krbinstance.py
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-09-13 00:10:45 +0300
committerMartin Kosek <mkosek@redhat.com>2011-09-13 11:35:25 +0200
commit7059bd195e3901c52920205b1fd9b91a8b2a52ca (patch)
tree7c751cacb02a964587d18960578a2c840e78a0e1 /ipaserver/install/krbinstance.py
parentb73b0178971a0547ba72a9fdfaa85ad4cfa1cacf (diff)
downloadfreeipa-7059bd195e3901c52920205b1fd9b91a8b2a52ca.tar.gz
freeipa-7059bd195e3901c52920205b1fd9b91a8b2a52ca.tar.xz
freeipa-7059bd195e3901c52920205b1fd9b91a8b2a52ca.zip
Convert server install code to platform-independent access to system services
https://fedorahosted.org/freeipa/ticket/1605
Diffstat (limited to 'ipaserver/install/krbinstance.py')
-rw-r--r--ipaserver/install/krbinstance.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py
index 47fd520d3..513dc5523 100644
--- a/ipaserver/install/krbinstance.py
+++ b/ipaserver/install/krbinstance.py
@@ -30,6 +30,7 @@ import service
import installutils
from ipapython import sysrestore
from ipapython import ipautil
+from ipapython import services as ipaservices
from ipalib import util
from ipalib import errors
@@ -226,7 +227,7 @@ class KrbInstance(service.Service):
def __configure_kdc_account_password(self):
hexpwd = ''
- for x in self.kdc_password:
+ for x in self.kdc_password:
hexpwd += (hex(ord(x))[2:])
self.fstore.backup_file("/var/kerberos/krb5kdc/ldappwd")
pwd_fd = open("/var/kerberos/krb5kdc/ldappwd", "w")
@@ -464,7 +465,7 @@ class KrbInstance(service.Service):
keydata = stash.read(keylen)
except os.error:
logging.critical("Failed to retrieve Master Key from Stash file: %s")
- #encode it in the asn.1 attribute
+ #encode it in the asn.1 attribute
MasterKey = univ.Sequence()
MasterKey.setComponentByPosition(0, univ.Integer(keytype))
MasterKey.setComponentByPosition(1, univ.OctetString(keydata))
@@ -574,7 +575,7 @@ class KrbInstance(service.Service):
pass
if not enabled is None and not enabled:
- self.chkconfig_off()
+ self.disable()
if not running is None and running:
self.start()