X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir-ldap.schema;h=b919a63682ccf9a5c2d69c8b73d1fd46f55339b2;hp=b45f6c7ead5a3c15feb3f598f2874c45210d5ca9;hb=HEAD;hpb=60e335bcb88d3995e4cc7217829b1bad233f7c8c

diff --git a/userdir-ldap.schema b/userdir-ldap.schema
index b45f6c7..b919a63 100644
--- a/userdir-ldap.schema
+++ b/userdir-ldap.schema
@@ -109,7 +109,10 @@
 #   .41 - sshdistAuthKeysHost
 #   .42 - dnsTTL
 #   .43 - webPassword
-#   .44 - voipPassword
+#   .44 - rtcPassword
+#   .45 - rebootPolicy
+#   .46 - totpSeed
+#   .47 - sshfpHostname
 #
 # .3 - experimental LDAP objectClasses
 #   .1 - debianDeveloper
@@ -331,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'
@@ -409,8 +412,8 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.2.43
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 
 attributetype ( 1.3.6.1.4.1.9586.100.4.2.44
-	NAME 'voipPassword'
-	DESC 'password for voip.debian.org'
+	NAME 'rtcPassword'
+	DESC 'rtc password for SIP/XMPP'
 	EQUALITY octetStringMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
 
@@ -528,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
@@ -536,6 +540,26 @@ attributetype ( 1.3.6.1.4.1.9586.100.4.4.42
 	EQUALITY caseIgnoreIA5Match
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.9586.100.4.4.45
+	NAME 'rebootPolicy'
+	DESC 'which procedure to use for rebooting this host'
+	EQUALITY caseIgnoreIA5Match
+	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
@@ -543,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'
@@ -564,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
 	) )
@@ -578,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
+	      sshdistAuthKeysHost $ rebootPolicy $ sshfpHostname
 	) )
 
 objectclass ( 1.3.6.1.4.1.9586.100.4.3.3