X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=ud-info;h=2ed498a62beec60c5a152e25062cee27f0e10a2b;hb=f8181b0dfa59390433a8329e61f0cfbc2f720644;hp=8b9618baf259dfd1399271064e6cfe90f70905bd;hpb=bf5629686e985d131f4fa9271d315aad29052c36;p=mirror%2Fuserdir-ldap.git

diff --git a/ud-info b/ud-info
index 8b9618b..2ed498a 100755
--- a/ud-info
+++ b/ud-info
@@ -20,7 +20,7 @@
 #   Copyright (c) 1999-2001  Jason Gunthorpe <jgg@debian.org>
 #   Copyright (c) 2004-2005,7,8  Joey Schulze <joey@infodrom.org>
 #   Copyright (c) 2001-2006  Ryan Murray <rmurray@debian.org>
-#   Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
+#   Copyright (c) 2008,2009 Peter Palfrader <peter@palfrader.org>
 #   Copyright (c) 2008 Martin Zobel-Helas <zobel@debian.org>
 #   Copyright (c) 2008 Marc 'HE' Brockschmidt <he@debian.org>
 #   Copyright (c) 2008 Mark Hymers <mhy@debian.org>
@@ -76,7 +76,7 @@ AttrInfo = {"cn": ["First Name", 101],
             "mailRBL": ["Mail RBLs",22],
             "mailRHSBL": ["Mail RHSBLs",23],
             "mailWhitelist": ["Mail Whitelist",24],
-	    "mailSpamOptOut": ["Mail Spam Filtering",25],
+	    "mailContentInspectionAction": ["mail C-I Action",25],
 	    "VoIP": ["VoIP Address",26],
 	    "comment": ["Comment",116],
 	    "userPassword": ["Crypted Password",117],
@@ -111,7 +111,7 @@ 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"],
+              "mailContentInspectionAction": ["Content Inspection Action (reject, blackhole, markup)"],
               "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 +252,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: