X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap.schema;h=700947450d4d3cd141dc0304e229bac83c1ee6b4;hb=5ccf0b31849a9d7a2be2377c05cbe0b015606716;hp=b1fd76bf46af3e7f43b7bdbf566c031fdb6592c3;hpb=c4154ed547a3875a82f554922544f6d05f80787f;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index b1fd76b..7009474 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -107,6 +107,7 @@
 #   .39 - allowedGroups
 #   .40 - exportOptions
 #   .41 - sshdistAuthKeysHost
+#   .42 - dnsTTL
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -126,6 +127,8 @@
 #   .11 - DNS RBL
 #   .12 - RHS RBL
 #   .13 - whitelist
+#   .14 - bATVToken
+#   .15 - mailDefaultOptions
 
 # Public attribute types
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.1 
@@ -482,6 +485,18 @@ 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 'bATVToken'
+	DESC 'Token for BATV'
+        EQUALITY caseExactMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.15
+	NAME 'mailDefaultOptions'
+	DESC 'Whether or not to use a default set of anti-spam options'
+	EQUALITY booleanMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
+
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
 	NAME 'mailContentInspectionAction'
 	DESC 'what to do on content inspection hits'
@@ -493,6 +508,11 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.41
 	NAME ( 'sshdistAuthKeysHost' )
 	SUP ipHostNumber )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.42
+	NAME 'dnsTTL'
+	DESC 'DNS Time To Live value'
+	EQUALITY caseIgnoreIA5Match
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
 # Public object classes
 
@@ -523,7 +543,8 @@ 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 $ mailContentInspectionAction
+              mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@ -533,7 +554,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
 	MUST ( host $ hostname )
 	MAY ( c $ access $ admin $ architecture $ bandwidth $ description $ disk $
 	      distribution $ l $ machine $ memory $ sponsor $
-	      sponsor-admin $ status $ physicalHost $ ipHostNumber $
+	      sponsor-admin $ status $ physicalHost $ ipHostNumber $ dnsTTL $
 	      sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord $
 	      sshdistAuthKeysHost
 	) )
@@ -544,5 +565,6 @@ 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 $ dnsZoneEntry $ mailContentInspectionAction
+	      mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction $
+              bATVToken $ mailDefaultOptions
 	) )