Received our 'enterprise number' 1.3.6.1.4.1.25404 from IANA.

Updated our LDAP schema.

diff --git a/citadel/openldap/citadel.schema b/citadel/openldap/citadel.schema
index f8bff46d7a92c2c35401e94e185c4995c5022809..65ace5f04a197dab31a4410e9aeb69e6b098c5a4 100644 (file)
--- a/citadel/openldap/citadel.schema
+++ b/citadel/openldap/citadel.schema
@@ -17,12 +17,23 @@
 #  include /etc/openldap/schema/citadel.schema
 
 
+##############################################################################
+#
+# Our OID tree so far looks like this:
+#
+# 1.3.6.1.4.1.25404                    citadel.org
+# 1.3.6.1.4.1.25404.1                  Citadel server project - LDAP schema
+# 1.3.6.1.4.1.25404.1.1                        Custom attributes
+# 1.3.6.1.4.1.25404.1.2                        Custom object classes
+#
+##############################################################################
+
 ######################
 # citadel attributes #
 ######################
 
 # alias used to provide alternative rfc822 email addresses for citadel users
-attributetype ( 1.3.6.1.4.1.19414.2.1.3
+attributetype ( 1.3.6.1.4.1.25404.1.1.1
   NAME 'alias'
   DESC 'RFC1274: RFC822 Mailbox'
   EQUALITY caseIgnoreIA5Match
@@ -37,7 +48,7 @@ attributetype ( 1.3.6.1.4.1.19414.2.1.3
 # we use a STRUCTURAL in order to ease integration
 # with existing inetOrgPerson objects
 
-objectclass ( 1.3.6.1.4.1.19414.3.2.2
+objectclass ( 1.3.6.1.4.1.25404.1.2.1
   NAME 'citadelInetOrgPerson'
   DESC 'Citadel Internet Organizational Person'
   SUP inetOrgPerson