diff options
| author | Simo Sorce <ssorce@redhat.com> | 2011-01-13 16:00:36 -0500 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2011-01-14 14:06:56 -0500 |
| commit | da7eb1155ec34941d71ad2449fd7e5de8a648d49 (patch) | |
| tree | 3748ed7b8ce6c4141b58a3121b2ddee4c6439d5d /ipaserver | |
| parent | 5549dca50e17cf8b0eb4880fa832630d26ecc5b9 (diff) | |
| download | freeipa-da7eb1155ec34941d71ad2449fd7e5de8a648d49.tar.gz freeipa-da7eb1155ec34941d71ad2449fd7e5de8a648d49.tar.xz freeipa-da7eb1155ec34941d71ad2449fd7e5de8a648d49.zip | |
Move mep templates under cn=etc
Fixes: https://fedorahosted.org/freeipa/ticket/760
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 4 | ||||
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 284bf2429..2bec95ce5 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -208,10 +208,10 @@ class DsInstance(service.Service): self.step("configuring ssl for ds instance", self.__enable_ssl) self.step("configuring certmap.conf", self.__certmap_conf) self.step("restarting directory server", self.__restart_instance) - self.step("configuring user private groups", self.__user_private_groups) - self.step("configuring netgroups from hostgroups", self.__host_nis_groups) def __common_post_setup(self): + self.step("configuring user private groups", self.__user_private_groups) + self.step("configuring netgroups from hostgroups", self.__host_nis_groups) self.step("initializing group membership", self.init_memberof) self.step("adding master entry", self.__add_master_entry) self.step("configuring Posix uid/gid generation", diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index b49a7832f..e2c83d9b2 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -627,7 +627,8 @@ class ldap2(CrudBackend, Encoder): if _upg is None: try: upg_entry = self.conn.search_s( - 'cn=UPG Template, %s' % api.env.basedn, _ldap.SCOPE_BASE, + 'cn=UPG Template,cn=etc,%s' % api.env.basedn, + _ldap.SCOPE_BASE, attrlist=['*'] )[0] _upg = True |