ud-mailgate: remove exception for münchen.debian.net

[mirror/userdir-ldap.git] / userdir-ldap.schema

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index 20cd287..b919a63 100644 (file)
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -111,6 +111,8 @@
 #   .43 - webPassword
 #   .44 - rtcPassword
 #   .45 - rebootPolicy
+#   .46 - totpSeed
+#   .47 - sshfpHostname
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -332,12 +334,12 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.29
        SUBSTR caseExactIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.9586.100.4.2.30
-       NAME 'gender'
-       DESC 'ISO 5218 representation of human gender'
-       EQUALITY integerMatch
-       SINGLE-VALUE
-       SYNTAX 1.3.6.1.4.1.1466.115.121.1.27{1} )
+#attributetype ( 1.3.6.1.4.1.9586.100.4.2.30
+#      NAME 'gender'
+#      DESC 'ISO 5218 representation of human gender'
+#      EQUALITY integerMatch
+#      SINGLE-VALUE
+#      SYNTAX 1.3.6.1.4.1.1466.115.121.1.27{1} )
 
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.31
        NAME 'birthDate'
@@ -529,6 +531,7 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.38
 
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.41
        NAME ( 'sshdistAuthKeysHost' )
+       DESC 'Additional hosts/addresess from which to accept ssh connections to the ud-ldap distribution host (db.DOMAIN)'
        SUP ipHostNumber )
 
 attributetype ( 1.3.6.1.4.1.9586.100.4.4.42
@@ -544,6 +547,19 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.45
        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.46
+       NAME 'totpSeed'
+       DESC 'Seed for TOTP authentication'
+       EQUALITY octetStringMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
+
+attributetype ( 1.3.6.1.4.1.9586.100.4.2.47
+       NAME 'sshfpHostname'
+       DESC 'Additional FQDN of the server on which to publish SSHFP records'
+       EQUALITY caseIgnoreIA5Match
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
+
 # Public object classes
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
@@ -551,7 +567,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.1.1
        DESC 'Abstraction of an account with POSIX attributes and UTF8 support'
        SUP top AUXILIARY
        MUST ( cn $ uid $ uidNumber $ gidNumber )
-       MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword $ webPassword $ voipPassword ) )
+       MAY ( userPassword $ loginShell $ gecos $ homeDirectory $ description $ mailDisableMessage $ sudoPassword $ webPassword $ rtcPassword $ totpSeed ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.1.2
        NAME 'debianGroup'
@@ -572,7 +588,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.1
              dnsZoneEntry $ emailForward $ icqUin $ ircNick $
              jabberJID $ keyFingerPrint $ latitude $ longitude $ mn $
              onVacation $ privateSub $ sshRSAAuthKey $ supplementaryGid $
-             access $ gender $ birthDate $ mailCallout $ mailGreylisting $
+             access $ birthDate $ mailCallout $ mailGreylisting $
               mailRBL $ mailRHSBL $ mailWhitelist $ VoIP $ mailContentInspectionAction $
               bATVToken $ mailDefaultOptions $ mailPreserveSuffixSeparator
        ) )
@@ -586,7 +602,7 @@ objectclass ( 1.3.6.1.4.1.9586.100.4.3.2
              distribution $ l $ machine $ memory $ sponsor $
              sponsor-admin $ status $ physicalHost $ ipHostNumber $ dnsTTL $
              sshRSAHostKey $ purpose $ allowedGroups $ exportOptions $ MXRecord $
-             sshdistAuthKeysHost $ rebootPolicy
+             sshdistAuthKeysHost $ rebootPolicy $ sshfpHostname
        ) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3