mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
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.
This commit is contained in:
@@ -23,7 +23,6 @@ try:
|
|||||||
import sys
|
import sys
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import krbV
|
|
||||||
import socket
|
import socket
|
||||||
import logging
|
import logging
|
||||||
import tempfile
|
import tempfile
|
||||||
@@ -36,6 +35,7 @@ try:
|
|||||||
from ipapython import sysrestore
|
from ipapython import sysrestore
|
||||||
from ipapython import version
|
from ipapython import version
|
||||||
import SSSDConfig
|
import SSSDConfig
|
||||||
|
from ConfigParser import RawConfigParser
|
||||||
except ImportError:
|
except ImportError:
|
||||||
print >> sys.stderr, """\
|
print >> sys.stderr, """\
|
||||||
There was a problem importing one of the required Python modules. The
|
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"
|
print "Removing Kerberos service principals from /etc/krb5.keytab"
|
||||||
try:
|
try:
|
||||||
ctx = krbV.default_context()
|
parser = RawConfigParser()
|
||||||
run(["/usr/sbin/ipa-rmkeytab", "-k", "/etc/krb5.keytab", "-r", ctx.default_realm])
|
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:
|
except:
|
||||||
print "Failed to clean up /etc/krb5.keytab"
|
print "Failed to clean up /etc/krb5.keytab"
|
||||||
|
|
||||||
|
|||||||
@@ -130,7 +130,6 @@ Summary: IPA authentication for use on clients
|
|||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Requires: %{name}-python = %{version}-%{release}
|
Requires: %{name}-python = %{version}-%{release}
|
||||||
Requires: python-ldap
|
Requires: python-ldap
|
||||||
Requires: python-krbV
|
|
||||||
Requires: cyrus-sasl-gssapi
|
Requires: cyrus-sasl-gssapi
|
||||||
Requires: ntp
|
Requires: ntp
|
||||||
Requires: krb5-workstation
|
Requires: krb5-workstation
|
||||||
@@ -497,6 +496,9 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 1 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-22
|
||||||
|
- Drop Requires of python-krbV on ipa-client
|
||||||
|
|
||||||
* Mon May 17 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-21
|
* Mon May 17 2010 Rob Crittenden <rcritten@redhat.com> - 1.99-21
|
||||||
- Load ipa_dogtag.pp in post install
|
- Load ipa_dogtag.pp in post install
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user