debianGroups may have cn attribute

diff --git a/debian/changelog b/debian/changelog
index 478d8b5..d3aa26b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
     - Allow sshRSAAuthKey for role accounts.
     - Support ssh key attributes for gitolite export.
     - Add ssh-gitolite support.
     - Allow sshRSAAuthKey for role accounts.
     - Support ssh key attributes for gitolite export.
     - Add ssh-gitolite support.

+  * debianGroups may have cn attribute (helpful when putting samba stuff into
+    ldap).

 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead
 
   [ Stephen Gran ]
   * Fix deprecation warnings for sha module by using hashlib module instead


@@ -33,7 +35,7 @@ userdir-ldap (0.3.XXX) UNRELEASED; urgency=low
   * ud-generate: generate webPasswords
   * ud-replicate: set correct permissions for web-passwords
 
   * ud-generate: generate webPasswords
   * ud-replicate: set correct permissions for web-passwords
 

- -- Peter Palfrader <weasel@debian.org>  Sat, 10 Mar 2012 14:49:47 +0100
+ -- Peter Palfrader <weasel@debian.org>  Sat, 10 Mar 2012 15:21:12 +0100

 
 userdir-ldap (0.3.79) unstable; urgency=low
 
 
 userdir-ldap (0.3.79) unstable; urgency=low
 

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 85e1bde..9bce9f4 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -535,7 +535,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
        SUP top STRUCTURAL
        DESC 'attributes used for Debian groups'
        MUST ( gid $ gidNumber )
        SUP top STRUCTURAL
        DESC 'attributes used for Debian groups'
        MUST ( gid $ gidNumber )

-       MAY ( description $ subGroup $ accountStatus ) )
+       MAY ( cn $ description $ subGroup $ accountStatus ) )

 
 # Experimental objectclasses:
 
 
 # Experimental objectclasses: