Merge from zobel: Fix userdir-ldap.schema (objectClass now contains MAY: VoIP)

diff --git a/debian/changelog b/debian/changelog
index d5ca5f8..c0e5019 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-userdir-ldap (0.3.XX) Xnstable; urgency=low
+userdir-ldap (0.3.26) unstable; urgency=low
 
   * ud-replicate: sgran pointed out that if all we care about ignoring is
     EEXIST then we should use mkdir -p instead of [ -d userkeys ] || mkdir
@@ -6,8 +6,9 @@ userdir-ldap (0.3.XX) Xnstable; urgency=low
   * ud-mailgate: a bug in DoSSH caused all changes to fail that came after
     DoSSH in HandleChange.  Now DoSSH properly returns without raising an
     exception if the line to handle is not an ssh public key.
+  * Fix userdir-ldap.schema (objectClass now contains MAY: VoIP). [zobel]
 
- -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:25:26 +0200
+ -- Peter Palfrader <weasel@debian.org>  Sun, 18 May 2008 14:27:50 +0200
 
 userdir-ldap (0.3.25) unstable; urgency=low
 

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index d31d0e7..3f64e90 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -474,7 +474,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
              jabberJID $ keyFingerPrint $ latitude $ longitude $ mn $
              onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
              access $ gender $ birthDate $ mailCallout $ mailGreylisting $
-              mailRBL $ mailRHSBL $ mailWhitelist
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2