From: Faidon Liambotis <paravoid@debian.org>
Date: Mon, 31 May 2010 14:38:21 +0000 (+0300)
Subject: Give keyring-maint write access to keyFingerPrint
X-Git-Tag: userdir-ldap-0.3.77~4
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=commitdiff_plain;h=1efd4dde6267910089fcf13b949c7e8ec030d447

Give keyring-maint write access to keyFingerPrint

However, make an exception for supplementaryGid=adm users for security
reasons (wouldn't want keyring-maint to be able to takeover a root
account).

The ACL gives writes to a non-existing group; this should be created,
e.g.
  cn=Keyring Maintainers,ou=users,dc=debian,dc=org
  objectClass: top
  objectClass: groupOfNames
  cn: Keyring Maintainers
  member: uid=noodles,ou=users,dc=debian,dc=org
  member: uid=gwolf,ou=users,dc=debian,dc=org

Signed-off-by: Peter Palfrader <peter@palfrader.org>
---

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index 450c280..4e4c92a 100644
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -30,6 +30,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 dn="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