X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=userdir-ldap-slapd.conf.in;h=7f3cd07fb1db3050be91561c4a6ea2581187606c;hb=a794b4d5308e09429e0eb85fcea3316e462fc7a0;hp=ac435dea83f7f54958e6f458a96d5846b67f6f72;hpb=19311a128c3376d141a8e89358696f188b81618c;p=mirror%2Fuserdir-ldap.git

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index ac435de..7f3cd07 100644
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -7,6 +7,10 @@ suffix          "@@DN@@"
 # Where the database file are physically stored
 directory       "/var/lib/ldap"
 
+moduleload      constraint
+overlay constraint
+constraint_attribute keyfingerprint regex ^([0-9A-F]{40})$
+
 # Indexing options
 index gecos,cn,sn,uid,ircNick,hostname,emailForward pres,eq,sub,approx
 index keyfingerprint,homeDirectory,objectClass,loginShell,supplementaryGid pres,eq
@@ -30,6 +34,12 @@ access to *
 	by dn="uid=sshdist,ou=users,@@DN@@" write
 	by * break
 
+# allow keyring maint to write to the keyFingerPrint attribute
+# (make an exception for adm for security reasons)
+access to filter="(!(supplementaryGid=adm))" attrs=keyFingerPrint
+	by group="cn=Keyring Maintainers,ou=users,@@DN@@" write
+	by * break
+
 # allow users write access to an explicit subset of their fields
 access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,privateSub,latitude,longitude,VoIP,userPassword,sudoPassword,bATVToken
 	by self write
@@ -50,7 +60,7 @@ access to attrs=sshrsaauthkey
 	by * none
 
 # debian.org readable, authenticated user readable
-access to attrs=activity-pgp,activity-from,dnsZoneEntry,c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
+access to attrs=activity-pgp,activity-from,dnsZoneEntry,c,l,loginShell,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
 	by peername.ip=127.0.0.1 read
 	by domain=alioth.debian.org none
 	by domain.subtree=@@DOMAIN@@ read