IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Correct update syntax in 30-s4u2proxy.update

Browse Source 
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
This commit is contained in:
Rob Crittenden
2012-02-10 12:00:35 -05:00
committed by Martin Kosek
parent af52c4d31e
commit f2da73e367
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install/updates/30-s4u2proxy.update
View File

@@ -9,7 +9,7 @@ default: objectClass: groupOfPrincipals
default: objectClass: top default: objectClass: top
default: cn: ipa-http-delegation default: cn: ipa-http-delegation
default: memberPrincipal: HTTP/$FQDN@$REALM 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 dn: cn=ipa-ldap-delegation-targets,cn=s4u2proxy,cn=etc,$SUFFIX
default: objectClass: groupOfPrincipals default: objectClass: groupOfPrincipals

12
ipaserver/install/ldapupdate.py
View File

@@ -86,11 +86,11 @@ class LDAPUpdate:
domain = ipautil.get_domain_name() domain = ipautil.get_domain_name()
libarch = self.__identify_arch() libarch = self.__identify_arch()
if not self.ldapi: fqdn = installutils.get_fqdn()
fqdn = installutils.get_fqdn() if fqdn is None:
if fqdn is None: raise RuntimeError("Unable to determine hostname")
raise RuntimeError("Unable to determine hostname") fqhn = fqdn # Save this for the sub_dict variable
else: if self.ldapi:
fqdn = "ldapi://%%2fvar%%2frun%%2fslapd-%s.socket" % "-".join( fqdn = "ldapi://%%2fvar%%2frun%%2fslapd-%s.socket" % "-".join(
self.realm.split(".") self.realm.split(".")
) )
@@ -98,7 +98,7 @@ class LDAPUpdate:
if not self.sub_dict.get("REALM") and self.realm is not None: if not self.sub_dict.get("REALM") and self.realm is not None:
self.sub_dict["REALM"] = self.realm self.sub_dict["REALM"] = self.realm
if not self.sub_dict.get("FQDN"): if not self.sub_dict.get("FQDN"):
self.sub_dict["FQDN"] = fqdn self.sub_dict["FQDN"] = fqhn
if not self.sub_dict.get("DOMAIN"): if not self.sub_dict.get("DOMAIN"):
self.sub_dict["DOMAIN"] = domain self.sub_dict["DOMAIN"] = domain
if not self.sub_dict.get("SUFFIX") and suffix is not None: if not self.sub_dict.get("SUFFIX") and suffix is not None: