X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fuserdir-ldap.git;a=blobdiff_plain;f=userdir-ldap-slapd.conf.in;h=0bec1837246475913e17c6e92eb0318f58c3dea7;hp=64759e49102f5b4cfa3117eb96d07923d443d51e;hb=HEAD;hpb=d0d37594a013b03c3e5991acddcc9afb514a8324

diff --git a/userdir-ldap-slapd.conf.in b/userdir-ldap-slapd.conf.in
index 64759e4..0bec183 100644
--- a/userdir-ldap-slapd.conf.in
+++ b/userdir-ldap-slapd.conf.in
@@ -21,7 +21,7 @@ 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
-index c,gender,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
+index c,dnsZoneEntry,birthDate,gidNumber,uidNumber pres,eq
 
 # Don't limit queries to the default of 500
 sizelimit 10000
@@ -47,8 +47,14 @@ access to filter="(!(supplementaryGid=adm))" attrs=keyFingerPrint
 	by group="cn=Keyring Maintainers,ou=users,@@DN@@" write
 	by * break
 
+# allow listmasters to write to the privateSub attribute
+access to attrs=privateSub
+	by group="cn=Listmasters,ou=users,@@DN@@" write
+	by self 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,webPassword,bATVToken
+access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,birthDate,mailDisableMessage,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions,facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCode,loginShell,onVacation,latitude,longitude,VoIP,userPassword,sudoPassword,webPassword,rtcPassword,bATVToken
 	by self write
 	by * break
 
@@ -58,19 +64,22 @@ access to attrs=c,l,loginShell,ircNick,labeledURI,icqUIN,jabberJID,onVacation,bi
 ##
 
 # allow authn/z by anyone
-access to attrs=userPassword,sudoPassword,webPassword,bATVToken
+access to attrs=userPassword,sudoPassword,webPassword,rtcPassword,bATVToken
 	by * compare
 
+# inaccessible to everybody
+access to attrs=totpSeed
+	by * none
+
 # readable only by self
 access to attrs=sshrsaauthkey
 	by self read
 	by * none
 
 # debian.org readable, authenticated user readable
-access to attrs=activity-pgp,activity-from,dnsZoneEntry,c,l,loginShell,onVacation,birthDate,mailDisableMessage,gender,emailforward,mailCallout,mailGreylisting,mailRBL,mailRHSBL,mailWhitelist,mailContentInspectionAction,mailDefaultOptions
+access to attrs=activity-pgp,activity-from,c,l,loginShell,onVacation,birthDate,mailDisableMessage,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=debian.org read
+	by domain.subtree=@@DOMAIN@@ read
 	by dn.regex="uid=.*,ou=users,@@DN@@" read
 	by * none
 
@@ -79,11 +88,13 @@ access to attrs=facsimileTelephoneNumber,telephoneNumber,postalAddress,postalCod
 	by dn.regex="uid=.*,ou=users,@@DN@@" read
 	by * none
 
-
 # rest is globally readable
-access to *
+access to attrs=access,accountComment,accountStatus,admin,allowedGroups,allowedHost,architecture,bandwidth,cn,comment,dc,description,disk,distribution,dnsTTL,dnsZoneEntry,exportOptions,gecos,gid,gidNumber,homeDirectory,host,hostname,icqUin,ipHostNumber,ircNick,jabberJID,keyFingerPrint,labeledURI,mXRecord,machine,member,memory,mn,objectClass,ou,physicalHost,purpose,shadowExpire,shadowLastChange,shadowMax,shadowMin,shadowWarning,sn,sponsor,sponsor-admin,sshRSAHostKey,status,subGroup,supplementaryGid,uid,uidNumber
 	by * read
 
+access to *
+	by * none
+
 
 database hdb
 directory       "/var/lib/ldap-log"