diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-02-10 12:00:35 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-02-15 17:27:27 +0100 |
| commit | f6f7475007f05e20483607030d114ecb726f497c (patch) | |
| tree | 7d5869584ee4560259e92382c2a61664b47aa399 | |
| parent | e3d9302741c569e81692ba789c9626832eef5a7f (diff) | |
| download | freeipa.git-f6f7475007f05e20483607030d114ecb726f497c.tar.gz freeipa.git-f6f7475007f05e20483607030d114ecb726f497c.tar.xz freeipa.git-f6f7475007f05e20483607030d114ecb726f497c.zip | |
Correct update syntax in 30-s4u2proxy.update
Always have FQDN available in the update dictionary. There were cases
where it would contain the ldapi socket path and not the FQDN.
https://fedorahosted.org/freeipa/ticket/2147
| -rw-r--r-- | install/updates/30-s4u2proxy.update | 2 | ||||
| -rw-r--r-- | ipaserver/install/ldapupdate.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/install/updates/30-s4u2proxy.update b/install/updates/30-s4u2proxy.update index 99b7a9cf..15c3f616 100644 --- a/install/updates/30-s4u2proxy.update +++ b/install/updates/30-s4u2proxy.update @@ -9,7 +9,7 @@ default: objectClass: groupOfPrincipals default: objectClass: top default: cn: ipa-http-delegation default: memberPrincipal: HTTP/$FQDN@$REALM -default: ipaAllowedTarget: 'cn=ipa-ldap-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX' +default: ipaAllowedTarget: cn=ipa-ldap-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX dn: cn=ipa-ldap-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX default: objectClass: groupOfPrincipals diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 8fbfeaf5..a2a94d31 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -86,11 +86,11 @@ class LDAPUpdate: domain = ipautil.get_domain_name() libarch = self.__identify_arch() - if not self.ldapi: - fqdn = installutils.get_fqdn() - if fqdn is None: - raise RuntimeError("Unable to determine hostname") - else: + fqdn = installutils.get_fqdn() + if fqdn is None: + raise RuntimeError("Unable to determine hostname") + fqhn = fqdn # Save this for the sub_dict variable + if self.ldapi: fqdn = "ldapi://%%2fvar%%2frun%%2fslapd-%s.socket" % "-".join( self.realm.split(".") ) @@ -98,7 +98,7 @@ class LDAPUpdate: if not self.sub_dict.get("REALM") and self.realm is not None: self.sub_dict["REALM"] = self.realm if not self.sub_dict.get("FQDN"): - self.sub_dict["FQDN"] = fqdn + self.sub_dict["FQDN"] = fqhn if not self.sub_dict.get("DOMAIN"): self.sub_dict["DOMAIN"] = domain if not self.sub_dict.get("SUFFIX") and suffix is not None: |