diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-08-31 16:59:27 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-08-31 16:59:27 -0400 |
| commit | d0ea0bb63891babd1c5778df2e291b527c8e927c (patch) | |
| tree | ecbc0c15a5e86da0fc4b7c049ebe2a0c420f516f /ipaserver | |
| parent | e05400dad83adabe09e57e9eb04b718c01019e32 (diff) | |
| download | freeipa-d0ea0bb63891babd1c5778df2e291b527c8e927c.tar.gz freeipa-d0ea0bb63891babd1c5778df2e291b527c8e927c.tar.xz freeipa-d0ea0bb63891babd1c5778df2e291b527c8e927c.zip | |
Changes to fix compatibility with Fedora 14
Fedora 14 introduced the following incompatiblities:
- the kerberos binaries moved from /usr/kerberos/[s]/bin to /usr/[s]bin
- the xmlrpclib in Python 2.7 is not fully backwards compatible to 2.6
Also, when moving the installed host service principals:
- don't assume that krbticketflags is set
- allow multiple values for krbextradata
ticket 155
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/installutils.py | 2 | ||||
| -rw-r--r-- | ipaserver/install/krbinstance.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ipaserver/install/installutils.py b/ipaserver/install/installutils.py index 0767f0c85..93d9f79b4 100644 --- a/ipaserver/install/installutils.py +++ b/ipaserver/install/installutils.py @@ -313,7 +313,7 @@ def get_directive(filename, directive, separator=' '): return None def kadmin(command): - ipautil.run(["/usr/kerberos/sbin/kadmin.local", "-q", command]) + ipautil.run(["kadmin.local", "-q", command]) def kadmin_addprinc(principal): kadmin("addprinc -randkey " + principal) diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 23ed10015..358fdaac1 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -111,11 +111,12 @@ class KrbInstance(service.Service): host_dn = "fqdn=%s,cn=computers,cn=accounts,%s" % (self.fqdn, self.suffix) host_entry = ipaldap.Entry(host_dn) host_entry.setValues('objectclass', ['top', 'ipaobject', 'nshost', 'ipahost', 'ipaservice', 'pkiuser', 'krbprincipalaux', 'krbprincipal', 'krbticketpolicyaux']) - host_entry.setValue('krbextradata', service_entry.getValue('krbextradata')) + host_entry.setValues('krbextradata', service_entry.getValues('krbextradata')) host_entry.setValue('krblastpwdchange', service_entry.getValue('krblastpwdchange')) host_entry.setValue('krbpasswordexpiration', service_entry.getValue('krbpasswordexpiration')) host_entry.setValue('krbprincipalname', service_entry.getValue('krbprincipalname')) - host_entry.setValue('krbticketflags', service_entry.getValue('krbticketflags')) + if 'krbticketflags' in service_entry.toDict(): + host_entry.setValue('krbticketflags', service_entry.getValue('krbticketflags')) host_entry.setValue('krbprincipalkey', service_entry.getValue('krbprincipalkey')) host_entry.setValue('serverhostname', self.fqdn.split('.',1)[0]) host_entry.setValue('cn', self.fqdn) @@ -323,7 +324,7 @@ class KrbInstance(service.Service): if not replica: #populate the directory with the realm structure - args = ["/usr/kerberos/sbin/kdb5_ldap_util", "-D", "uid=kdc,cn=sysaccounts,cn=etc,"+self.suffix, "-w", self.kdc_password, "create", "-s", "-P", self.master_password, "-r", self.realm, "-subtrees", self.suffix, "-sscope", "sub"] + args = ["kdb5_ldap_util", "-D", "uid=kdc,cn=sysaccounts,cn=etc,"+self.suffix, "-w", self.kdc_password, "create", "-s", "-P", self.master_password, "-r", self.realm, "-subtrees", self.suffix, "-sscope", "sub"] try: ipautil.run(args) except ipautil.CalledProcessError, e: |