From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 14 Jul 2009 07:32:47 +0000 (+0200)
Subject: Remove mailSpamOptOut ldap attribute - it isn't used anywhere.
X-Git-Tag: userdir-ldap-0.3.67~5
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=1570e2d8c244bac134d0c03deaf91e5ff88fd5a3

Remove mailSpamOptOut ldap attribute - it isn't used anywhere.
---

diff --git a/debian/changelog b/debian/changelog
index c6e6cfd..13abc52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ userdir-ldap (0.3.66+XX) unstable; urgency=low
 
   [ Peter Palfrader ]
   * .debian.net DNS creates BSMTP maps for MX 0 master in addition to gluck.
+  * Remove mailSpamOptOut ldap attribute - it isn't used anywhere.
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 29 Jun 2009 13:49:25 +0200
+ -- Peter Palfrader <weasel@debian.org>  Tue, 14 Jul 2009 09:32:25 +0200
 
 userdir-ldap (0.3.66) unstable; urgency=low
 
diff --git a/ud-info b/ud-info
index 8b9618b..60ea404 100755
--- a/ud-info
+++ b/ud-info
@@ -76,7 +76,6 @@ AttrInfo = {"cn": ["First Name", 101],
             "mailRBL": ["Mail RBLs",22],
             "mailRHSBL": ["Mail RHSBLs",23],
             "mailWhitelist": ["Mail Whitelist",24],
-	    "mailSpamOptOut": ["Mail Spam Filtering",25],
 	    "VoIP": ["VoIP Address",26],
 	    "comment": ["Comment",116],
 	    "userPassword": ["Crypted Password",117],
@@ -111,7 +110,6 @@ AttrPrompt = {"cn": ["Common name or first name"],
               "mailRBL": ["SMTP time RBL lists"],
               "mailRHSBL": ["SMTP time RHSBL lists"],
               "mailWhitelist": ["SMTP time whitelist from other checks"],
-              "mailSpamOptOut": ["Mail Spam Filtering"],
               "member": ["LDAP Group Member for slapd ACLs"],
 	      "latitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
 	      "longitude": ["XEarth latitude in ISO 6709 format - see /usr/share/zoneinfo/zone.tab or etak.com"],
@@ -252,7 +250,7 @@ def ChangeAttr(Attrs,Attr):
       Attrs[1][Attr] = [""];
       return;
 
-   if (Attr == "mailSpamOptOut" or Attr == "mailGreylisting" or Attr == "mailCallout"):
+   if (Attr == "mailGreylisting" or Attr == "mailCallout"):
       if (NewValue.lower() != "true" and NewValue.lower() != "false"):
          if (NewValue == "1"): NewValue = "true"
          else:
diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 25c403a..93d2812 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -120,7 +120,6 @@
 #   .11 - DNS RBL
 #   .12 - RHS RBL
 #   .13 - whitelist
-#   .14 - OptOut Spamfiltering
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -479,12 +478,6 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.13
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-attributetype ( 1.3.6.1.4.1.9586.100.4.4.14
-	NAME 'mailSpamOptOut'
-	DESC 'I dont like the debian anti spam setup, i want no spam filtering'
-	EQUALITY booleanMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
-
 # Experimental objectclasses:
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
@@ -498,7 +491,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 $ VoIP $ mailSpamOptOut
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -517,5 +510,5 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.3
 	SUP account STRUCTURAL
 	MAY ( emailForward $ supplementaryGid $ allowedHost $ labeledURI $
 	      mailCallout $ mailGreylisting $ mailRBL $ mailRHSBL $
-	      mailWhitelist $ mailSpamOptOut $ dnsZoneEntry
+	      mailWhitelist $ dnsZoneEntry
 	) )