Ticket #760 -- Simo Sorce * Red Hat, Inc * New York
>From c79edab58d0517354053c666f8347cde377431ef Mon Sep 17 00:00:00 2001 From: Simo Sorce <sso...@redhat.com> Date: Thu, 13 Jan 2011 16:00:36 -0500 Subject: [PATCH 2/4] Move mep templates under cn=etc
Fixes: https://fedorahosted.org/freeipa/ticket/760 --- install/share/host_nis_groups.ldif | 4 ++-- install/share/user_private_groups.ldif | 4 ++-- ipaserver/plugins/ldap2.py | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/install/share/host_nis_groups.ldif b/install/share/host_nis_groups.ldif index 24bb136ece442acba8665de27a5aa930f3f0b14e..b29d982cc6a1b8d419771fef1aac0e539960162c 100644 --- a/install/share/host_nis_groups.ldif +++ b/install/share/host_nis_groups.ldif @@ -1,4 +1,4 @@ -dn: cn=NGP HGP Template,$SUFFIX +dn: cn=NGP HGP Template,cn=etc,$SUFFIX changetype: add objectclass: mepTemplateEntry cn: NGP HGP Template @@ -18,4 +18,4 @@ cn: HGP Definition originScope: cn=hostgroups,cn=accounts,$SUFFIX originFilter: objectclass=ipahostgroup managedBase: cn=ng,cn=alt,$SUFFIX -managedTemplate: cn=NGP HGP Template,$SUFFIX +managedTemplate: cn=NGP HGP Template,cn=etc,$SUFFIX diff --git a/install/share/user_private_groups.ldif b/install/share/user_private_groups.ldif index 6a3f49d8626c7c721aae6cd0d71e0c4ca52d4650..9df729a47207d2ab3dd30f763a73d05b102d882b 100644 --- a/install/share/user_private_groups.ldif +++ b/install/share/user_private_groups.ldif @@ -1,4 +1,4 @@ -dn: cn=UPG Template,$SUFFIX +dn: cn=UPG Template,cn=etc,$SUFFIX changetype: add objectclass: mepTemplateEntry cn: UPG Template @@ -17,5 +17,5 @@ cn: UPG Definition originScope: cn=users,cn=accounts,$SUFFIX originFilter: objectclass=posixAccount managedBase: cn=groups,cn=accounts,$SUFFIX -managedTemplate: cn=UPG Template,$SUFFIX +managedTemplate: cn=UPG Template,cn=etc,$SUFFIX diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index a728199eb25292c9a5a513f371d4b2a154fd1eb4..c2aae2be3e0ba082df7b72e9aef19fe56edbc67a 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -625,7 +625,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 -- 1.7.3.4
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
