projects
/
mirror
/
userdir-ldap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
and update ldap schema and acls appropriately. *cough*
[mirror/userdir-ldap.git]
/
userdir-ldap.schema
diff --git
a/userdir-ldap.schema
b/userdir-ldap.schema
index
b1fd76b
..
1be2c29
100644
(file)
--- a/
userdir-ldap.schema
+++ b/
userdir-ldap.schema
@@
-107,6
+107,7
@@
# .39 - allowedGroups
# .40 - exportOptions
# .41 - sshdistAuthKeysHost
# .39 - allowedGroups
# .40 - exportOptions
# .41 - sshdistAuthKeysHost
+# .42 - dnsTTL
#
# .3 - experimental LDAP objectClasses
# .1 - debianDeveloper
#
# .3 - experimental LDAP objectClasses
# .1 - debianDeveloper
@@
-126,6
+127,7
@@
# .11 - DNS RBL
# .12 - RHS RBL
# .13 - whitelist
# .11 - DNS RBL
# .12 - RHS RBL
# .13 - whitelist
+# .14 - bATVToken
# Public attribute types
attributetype ( 1.3.6.1.4.1.9586.100.4.2.1
# Public attribute types
attributetype ( 1.3.6.1.4.1.9586.100.4.2.1
@@
-482,6
+484,12
@@
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} )
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.2.38
NAME 'mailContentInspectionAction'
DESC 'what to do on content inspection hits'
attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
NAME 'mailContentInspectionAction'
DESC 'what to do on content inspection hits'
@@
-493,6
+501,11
@@
attributetype ( 1.3.6.1.4.1.9586.100.4.2.41
NAME ( 'sshdistAuthKeysHost' )
SUP ipHostNumber )
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
# Public object classes
@@
-523,7
+536,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 $
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
) )
objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
) )
objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
@@
-533,7
+546,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 $
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
) )
sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord $
sshdistAuthKeysHost
) )
@@
-544,5
+557,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 $
SUP account STRUCTURAL
MAY ( emailForward $ supplementaryGid $ allowedHost $ labeledURI $
mailCallout $ mailGreylisting $ mailRBL $ mailRHSBL $
- mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction
+ mailWhitelist $ dnsZoneEntry $ mailContentInspectionAction
$ bATVToken
) )
) )