From a3a82a7f91fee07e89db8d28a888fe1d396b0d38 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 16 Sep 2008 21:54:41 +0200
Subject: ldif files: group member as DSA role (not SAM user).

---
 ldap/db/cipux.ldif.in | 6 +++---
 ldap/db/horde.ldif.in | 8 ++++----
 ldap/mkldapdb         | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'ldap')

diff --git a/ldap/db/cipux.ldif.in b/ldap/db/cipux.ldif.in
index cec5396..a7bd302 100644
--- a/ldap/db/cipux.ldif.in
+++ b/ldap/db/cipux.ldif.in
@@ -1,6 +1,6 @@
-dn: uid=cipux,ou=System,ou=Entities,ou=SAM,@SUFFIX@
+dn: cn=cipux,ou=Entities,ou=Access Control,@SUFFIX@
 objectClass: top
-objectclass: account
+objectclass: organizationalRole
 objectClass: simpleSecurityObject
-uid: cipux
+cn: cipux
 userPassword: superSecretPassword
diff --git a/ldap/db/horde.ldif.in b/ldap/db/horde.ldif.in
index 0c28f79..00819ca 100644
--- a/ldap/db/horde.ldif.in
+++ b/ldap/db/horde.ldif.in
@@ -1,11 +1,11 @@
-dn: uid=horde,ou=System,ou=Entities,ou=SAM,@SUFFIX@
+dn: cn=horde,ou=Entities,ou=Access Control,@SUFFIX@
 objectClass: top
-objectclass: account
+objectclass: organizationalRole
 objectClass: simpleSecurityObject
-uid: horde
+cn: horde
 userPassword: superSecretPassword
 
 dn: cn=Horde,ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
 objectClass: groupOfUniqueNames
 cn: Horde
-uniqueMember: uid=horde,ou=System,ou=Entities,ou=SAM,@SUFFIX@
+uniqueMember: cn=horde,ou=Entities,ou=Access Control,@SUFFIX@
diff --git a/ldap/mkldapdb b/ldap/mkldapdb
index 0e5e6b2..a1b0742 100755
--- a/ldap/mkldapdb
+++ b/ldap/mkldapdb
@@ -54,9 +54,9 @@ done
 for section in base cipux horde; do
 	ldapadd -x -h localhost -D "cn=admin,$basedn" -f "$tempdir/$section.ldif" -W
 done
-for section in cipux horde; do
-	echo "Securing $section..."
-	ldappasswd -x -h localhost -D "cn=admin,$basedn" -S -W "uid=$section,ou=System,ou=Entities,ou=SAM,$basedn"
+for role in cipux horde; do
+	echo "Securing $role..."
+	ldappasswd -x -h localhost -D "cn=admin,$basedn" -S -W "cn=$role,ou=Entities,ou=Access Control,$basedn"
 done
 
 # TODO: Write as function, and create group if not existing
@@ -64,5 +64,5 @@ ldapmodify -x -h localhost -D "cn=admin,$basedn" -W <<EOF
 dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,$basedn
 changetype: modify
 add: uniqueMember
-uniqueMember: uid=cipux,ou=System,ou=Entities,ou=SAM,$basedn
+uniqueMember: cn=cipux,ou=Entities,ou=Access Control,$basedn
 EOF
-- 
cgit v1.2.3