From dbd1f501114f9ace96fc4c9b1a2308202f4e646a Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 1 Jun 2010 14:24:37 -0400 Subject: Remove Requires on separate package python-krbV in client We need the configured kerberos realm so we can clean up /etc/krb5.keytab. We have this already in /etc/ipa/default.conf so use that instead of requiring a whole other python package to do it. --- ipa-client/ipa-install/ipa-client-install | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ipa-client/ipa-install/ipa-client-install') diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index d7ee70d0b..c1cc40a71 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -23,7 +23,6 @@ try: import sys import os - import krbV import socket import logging import tempfile @@ -36,6 +35,7 @@ try: from ipapython import sysrestore from ipapython import version import SSSDConfig + from ConfigParser import RawConfigParser except ImportError: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The @@ -204,8 +204,12 @@ def uninstall(options): print "Removing Kerberos service principals from /etc/krb5.keytab" try: - ctx = krbV.default_context() - run(["/usr/sbin/ipa-rmkeytab", "-k", "/etc/krb5.keytab", "-r", ctx.default_realm]) + parser = RawConfigParser() + fp = open('/etc/ipa/default.conf', 'r') + parser.readfp(fp) + fp.close() + realm = parser.get('global', 'realm') + run(["/usr/sbin/ipa-rmkeytab", "-k", "/etc/krb5.keytab", "-r", realm]) except: print "Failed to clean up /etc/krb5.keytab" -- cgit