[dovecot-cvs] dovecot/doc dovecot-ldap.conf, 1.11, 1.12 dovecot-sql.conf, 1.7, 1.8

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/doc
In directory talvi:/tmp/cvs-serv1464/doc

Modified Files:
	dovecot-ldap.conf dovecot-sql.conf 
Log Message:
Added some more information about prefetch userdb.



Index: dovecot-ldap.conf
===================================================================
RCS file: /var/lib/cvs/dovecot/doc/dovecot-ldap.conf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dovecot-ldap.conf	2 Dec 2005 11:05:28 -0000	1.11
+++ dovecot-ldap.conf	10 Dec 2005 20:36:18 -0000	1.12
@@ -53,6 +53,12 @@
 #  password: Password, may optionally start with {type}, eg. {crypt}
 #pass_attrs = uid=user,userPassword=password
 
+# If you wish to avoid two LDAP lookups (passdb + userdb), you can use
+# userdb prefetch instead of userdb ldap in dovecot.conf. In that case you'll
+# also have to include user_attrs in pass_attrs field prefixed with "userdb_"
+# string. For example:
+#pass_attrs = uid=user,userPassword=password,homeDirectory=userdb_home,uidNumber=userdb_uid,gidNumber=userdb_gid
+
 # Filter for password lookups
 #pass_filter = (&(objectClass=posixAccount)(uid=%u))
 

Index: dovecot-sql.conf
===================================================================
RCS file: /var/lib/cvs/dovecot/doc/dovecot-sql.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dovecot-sql.conf	12 Jul 2005 18:14:44 -0000	1.7
+++ dovecot-sql.conf	10 Dec 2005 20:36:18 -0000	1.8
@@ -95,3 +95,9 @@
 #   user_query = SELECT home, 501 AS uid, 501 AS gid FROM users WHERE userid = '%u'
 #
 #user_query = SELECT home, uid, gid FROM users WHERE userid = '%u'
+
+# If you wish to avoid two SQL lookups (passdb + userdb), you can use
+# userdb prefetch instead of userdb sql in dovecot.conf. In that case you'll
+# also have to return userdb fields in password_query prefixed with "userdb_"
+# string. For example:
+#password_query = SELECT userid as user, password, home as userdb_home, uid as userdb_uid, gid as userdb_gid FROM users WHERE userid = '%u'