[Da-tools-commits] ./debian/userdir-ldap r393: Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate about it. [zobel]

[Peter Palfrader]

------------------------------------------------------------
revno: 393
committer: Peter Palfrader <peter at palfrader.org>
branch nick: userdir-ldap
timestamp: Wed 2008-05-14 17:32:49 +0200
message:
  Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate about it. [zobel]
modified:
  debian/changelog
  ud-info
  ud-mailgate
  userdir-ldap.schema
    ------------------------------------------------------------
    revno: 349.2.33
    committer: Martin Zobel-Helas <zobel at debian.org>
    branch nick: userdir-ldap-common
    timestamp: Sat 2008-05-10 14:19:22 +0200
    message:
      add VoIP
    modified:
      ud-info
      ud-mailgate
      userdir-ldap.schema
-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2008-05-13 20:09:02 +0000
+++ b/debian/changelog	2008-05-14 15:32:49 +0000
@@ -1,3 +1,10 @@
+userdir-ldap (0.3.21+X) Xunstable; urgency=low
+
+  * Add VoIP fiels to the LDAP shema and teach ud-info and ud-mailgate
+    about it. [zobel]
+
+ -- Peter Palfrader <weasel at debian.org>  Wed, 14 May 2008 17:31:22 +0200
+
 userdir-ldap (0.3.21) unstable; urgency=low
 
   * ud-replicate: use the host key to sync stuff from the db server,

=== modified file 'ud-info'
--- a/ud-info	2007-12-26 20:49:42 +0000
+++ b/ud-info	2008-05-10 12:19:22 +0000
@@ -55,7 +55,8 @@
             "mailWhitelist": ["Mail Whitelist",24],
 	    "comment": ["Comment",116],
 	    "userPassword": ["Crypted Password",117],
-            "dnsZoneEntry": ["d.net Entry",118]};
+            "dnsZoneEntry": ["d.net Entry",118],
+            "VoIP": ["VoIP Address",119]}; 
 
 AttrPrompt = {"cn": ["Common name or first name"],
               "mn": ["Middle name (or initial if it ends in a dot)"],
@@ -89,7 +90,8 @@
 	      "dnsZoneEntry": ["DNS Zone fragment associated this this user"],
               "labeledURI": ["Web home page"],
               "jabberJID": ["Jabber ID"],
-              "icqUin": ["ICQ UIN Number"]};
+              "icqUin": ["ICQ UIN Number"],
+              "VoIP": ["VoIP Address"]};
 
 # Create a map of IDs to desc,value,attr
 OrderedIndex = {};

=== modified file 'ud-mailgate'
--- a/ud-mailgate	2008-04-21 22:18:09 +0000
+++ b/ud-mailgate	2008-05-10 12:19:22 +0000
@@ -44,6 +44,7 @@
               "mailDisableMessage": ".*",
 	      "mailGreylisting": "^(TRUE|FALSE)$",
 	      "mailCallout": "^(TRUE|FALSE)$",
+	      "VoIP": ".*",
 };
 
 DelItems = {"c": None,
@@ -71,6 +72,7 @@
             "mailRHSBL": None,
             "mailWhitelist": None,
             "mailDisableMessage": None,
+            "VoIP": None,
             };
 
 # Decode a GPS location from some common forms

=== modified file 'userdir-ldap.schema'
--- a/userdir-ldap.schema	2007-12-25 14:37:29 +0000
+++ b/userdir-ldap.schema	2008-05-10 12:19:22 +0000
@@ -3,6 +3,7 @@
 # XXX
 #   - [PP] Now version controlled in db.d.o bzr repository - 2007-12-25
 #   - [HE] Add 'purpose', 'physicalHost' to debianServer - 2007-12-25
+#   - [zobel] Add 'VoIP' - 2008-05-10
 #
 # 0.7 [RM]
 #   - Add 'gender' and 'birthDate' to debianDeveloper
@@ -96,6 +97,7 @@
 #   .32 - mailDisableMessage
 #   .33 - purpose
 #   .34 - physicalHost
+#   .35 - VoIP
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -350,6 +352,13 @@
 	SINGLE-VALUE
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.35
+	NAME 'VoIP'
+	DESC 'VoIP URL to communicate with that person'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 # Public object classes
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.1