From 4e1d291d15e198a0517a2c6787f865fe41147440 Mon Sep 17 00:00:00 2001
From: John Dennis <jdennis@redhat.com>
Date: Fri, 30 Nov 2007 20:29:12 -0500
Subject: [PATCH] change location of radius data in ldap from
 cn=radius,cn=services,cn=etc to cn=radius

---
 ipa-python/radius_util.py                          |  4 ++--
 .../ipa-install/share/bootstrap-template.ldif      | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ipa-python/radius_util.py b/ipa-python/radius_util.py
index 96bc0f899..1f6e7902b 100644
--- a/ipa-python/radius_util.py
+++ b/ipa-python/radius_util.py
@@ -205,7 +205,7 @@ radius_profile_attr_to_ldap_attr = reverse_map_dict(radius_profile_ldap_attr_to_
 
 #------------------------------------------------------------------------------
 
-clients_container = 'cn=clients,cn=radius,cn=services,cn=etc'
+clients_container = 'cn=clients,cn=radius'
 
 def radius_clients_basedn(container, suffix):
     if container is None: container = clients_container
@@ -221,7 +221,7 @@ def radius_client_dn(client, container, suffix):
 
 # --
 
-profiles_container = 'cn=profiles,cn=radius,cn=services,cn=etc'
+profiles_container = 'cn=profiles,cn=radius'
 
 def radius_profiles_basedn(container, suffix):
     if container is None: container = profiles_container
diff --git a/ipa-server/ipa-install/share/bootstrap-template.ldif b/ipa-server/ipa-install/share/bootstrap-template.ldif
index 6232a3f69..f981005d2 100644
--- a/ipa-server/ipa-install/share/bootstrap-template.ldif
+++ b/ipa-server/ipa-install/share/bootstrap-template.ldif
@@ -75,31 +75,25 @@ homeDirectory: /home/admin
 loginShell: /bin/bash
 gecos: Administrator
 
-dn: cn=services,cn=etc,$SUFFIX
-changetype: add
-objectClass: nsContainer
-objectClass: top
-cn: services
-
-dn: cn=radius,cn=services,cn=etc,$SUFFIX
+dn: cn=radius,$SUFFIX
 changetype: add
 objectClass: nsContainer
 objectClass: top
 cn: radius
 
-dn: cn=clients,cn=radius,cn=services,cn=etc,$SUFFIX
+dn: cn=clients,cn=radius,$SUFFIX
 changetype: add
 objectClass: nsContainer
 objectClass: top
 cn: clients
 
-dn: cn=profiles,cn=radius,cn=services,cn=etc,$SUFFIX
+dn: cn=profiles,cn=radius,$SUFFIX
 changetype: add
 objectClass: nsContainer
 objectClass: top
 cn: profiles
 
-dn: uid=ipa_default, cn=profiles,cn=radius,cn=services,cn=etc,$SUFFIX
+dn: uid=ipa_default, cn=profiles,cn=radius,$SUFFIX
 changetype: add
 objectClass: top
 objectClass: radiusprofile