diff options
Diffstat (limited to 'ipaserver/install')
-rw-r--r-- | ipaserver/install/dsinstance.py | 5 | ||||
-rw-r--r-- | ipaserver/install/krbinstance.py | 11 |
2 files changed, 5 insertions, 11 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 06f9e3a4..35b70528 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -346,6 +346,7 @@ class DsInstance(service.Service): self.__common_setup(True) self.step("setting up initial replication", self.__setup_replica) + self.step("updating schema", self.__update_schema) # See LDIFs for automember configuration during replica install self.step("setting Auto Member configuration", self.__add_replica_automember_config) self.step("enabling S4U2Proxy delegation", self.__setup_s4u2proxy) @@ -368,6 +369,10 @@ class DsInstance(service.Service): r_bindpw=self.dm_password) self.run_init_memberof = repl.needs_memberof_fixup() + def __update_schema(self): + # FIXME: https://fedorahosted.org/389/ticket/47490 + self._ldap_mod("schema-update.ldif") + def __enable(self): self.backup_state("enabled", self.is_enabled()) # At the end of the installation ipa-server-install will enable the diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py index 3c59db85..a16e4d5f 100644 --- a/ipaserver/install/krbinstance.py +++ b/ipaserver/install/krbinstance.py @@ -252,17 +252,6 @@ class KrbInstance(service.Service): # we need to remove any existing SASL mappings in the directory as otherwise they # they may conflict. - # FIXME: https://fedorahosted.org/389/ticket/47490 - entry = self.admin_conn.get_entry( - DN(('cn', 'schema')), ['objectClasses']) - entry['objectClasses'].append( - "( 2.16.840.1.113730.3.2.317 NAME 'nsSaslMapping' " - "DESC 'Netscape defined objectclass' SUP top " - "MUST ( cn $ nsSaslMapRegexString $ nsSaslMapBaseDNTemplate $ " - "nsSaslMapFilterTemplate ) MAY ( nsSaslMapPriority ) " - "X-ORIGIN 'Netscape Directory Server' )") - self.admin_conn.update_entry(entry) - try: res = self.admin_conn.get_entries( DN(('cn', 'mapping'), ('cn', 'sasl'), ('cn', 'config')), |