summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Dennis <jdennis@redhat.com>2007-11-30 20:29:12 -0500
committerJohn Dennis <jdennis@redhat.com>2007-11-30 20:29:12 -0500
commit4e1d291d15e198a0517a2c6787f865fe41147440 (patch)
tree50fff863e70e5295c552266fa03b690af0057e7e
parent6be932e8af1f9e874071da943c129457d724b46c (diff)
downloadfreeipa-4e1d291d15e198a0517a2c6787f865fe41147440.tar.gz
freeipa-4e1d291d15e198a0517a2c6787f865fe41147440.tar.xz
freeipa-4e1d291d15e198a0517a2c6787f865fe41147440.zip
change location of radius data in ldap from
cn=radius,cn=services,cn=etc to cn=radius
-rw-r--r--ipa-python/radius_util.py4
-rw-r--r--ipa-server/ipa-install/share/bootstrap-template.ldif14
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