[dovecot-cvs] dovecot/doc dovecot-ldap.conf,1.10,1.11

[cras at dovecot.org]

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

Modified Files:
	dovecot-ldap.conf 
Log Message:
Comment changes to reflect the new way to configure pass_attrs and user_attrs (which has been there for months already, the old way still works too).



Index: dovecot-ldap.conf
===================================================================
RCS file: /var/lib/cvs/dovecot/doc/dovecot-ldap.conf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dovecot-ldap.conf	12 Jul 2005 18:14:44 -0000	1.10
+++ dovecot-ldap.conf	2 Dec 2005 11:05:28 -0000	1.11
@@ -30,15 +30,15 @@
 # Search scope: base, onelevel, subtree
 #scope = subtree
 
-# User attributes in order:
-#  Virtual user name (user at domain)
-#  Home directory
-#  MAIL environment
-#  System user name (for getting user's groups from /etc/group)
+# User attributes are given in LDAP-name=dovecot-internal-name list. The
+# internal names are:
+#  home: Home directory
+#  mail: MAIL environment
+#  system_user: System user name (for getting user's groups from /etc/group)
 #    - For virtual users you don't want to use this, so this defaults to none.
-#  System UID
-#  System GID
-#user_attrs = uid,homeDirectory,,,uidNumber,gidNumber
+#  uid: System user ID
+#  gid: System group ID
+#user_attrs = homeDirectory=home,uidNumber=uid,gidNumber=gid
 
 # Filter for user lookup. Some variables can be used (see
 # http://wiki.dovecot.org/Variables for full list):
@@ -47,10 +47,11 @@
 #   %d - domain part in user at domain, empty if user there's no domain
 #user_filter = (&(objectClass=posixAccount)(uid=%u))
 
-# Password checking attributes in order:
-#  Virtual user name (user at domain)
-#  Password, may optionally start with {type}, eg. {crypt}
-#pass_attrs = uid,userPassword
+# Password checking attributes:
+#  user: Virtual user name (user at domain), if you wish to change the
+#        user-given username to something else
+#  password: Password, may optionally start with {type}, eg. {crypt}
+#pass_attrs = uid=user,userPassword=password
 
 # Filter for password lookups
 #pass_filter = (&(objectClass=posixAccount)(uid=%u))