1 files changed, 72 insertions, 8 deletions
diff --git a/ldap/db/base.ldif.in b/ldap/db/base.ldif.in
index 31624a6..88f4eaa 100644
--- a/ldap/db/base.ldif.in
+++ b/ldap/db/base.ldif.in
@@ -1,14 +1,78 @@
-dn: ou=DSA, @SUFFIX@
+dn: ou=Customers,@SUFFIX@
 objectclass: organizationalUnit
-ou: DSA
-description: Directory System Agent
+ou: Customers
+description: Customers at @ORG@
 
-dn: ou=people, @SUFFIX@
+dn: ou=SubSystems,@SUFFIX@
+objectclass: organizationalUnit
+ou: SubSystems
+
+dn: ou=Mail,ou=SubSystems,@SUFFIX@
+objectclass: organizationalUnit
+ou: Mail
+
+dn: ou=SAM,@SUFFIX@
+objectclass: organizationalUnit
+ou: SAM
+description: Samba and NSS stuff
+
+dn: ou=Groups,ou=SAM,@SUFFIX@
+objectClass: organizationalUnit
+ou: Groups
+description: Groups at @ORG@
+
+dn: ou=Hosts,ou=SAM,@SUFFIX@
+objectClass: organizationalUnit
+ou: Hosts
+description: Hosts at @ORG@
+
+dn: ou=Services,ou=SAM,@SUFFIX@
+objectClass: organizationalUnit
+ou: Hosts
+description: System services at @ORG@
+
+dn: ou=idMap,ou=SAM,@SUFFIX@
+objectClass: organizationalUnit
+ou: idMap
+description: Samba idmap subsystem
+
+dn: ou=Entities,ou=SAM,@SUFFIX@
 objectClass: organizationalUnit
-ou: people
+ou: Entities
+description: Human and non-human entities
+
+dn: ou=People,ou=Entities,ou=SAM,@SUFFIX@
+objectClass: organizationalUnit
+ou: People
 description: Users in @ORG@
 
-dn: ou=group, @SUFFIX@
+dn: ou=System,ou=Entities,ou=SAM,@SUFFIX@
 objectClass: organizationalUnit
-ou: group
-description: Groups at @ORG@
+ou: System
+description: Non-human entities in @ORG@
+
+dn: ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+ou: Access Control
+
+dn: ou=Groups,ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+ou: Groups
+
+dn: cn=Replicants,ou=Groups,ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+cn: Replicants
+
+dn: ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+ou: Administrators
+
+dn: cn=DSA,ou=Administrators,ou=Groups,ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+cn: DSA
+description: Directory System Agent administrators
+
+dn: ou=Entities,ou=Access Control,@SUFFIX@
+objectClass: organizationalUnit
+ou: Entities
+description: DSA-only entities