LDAP: Removed the system_user=uid defaulting. LDAP usually has only virtual

users which don't exist in /etc/group. Clarified what the system user
actually does for ldap/pgsql.

--HG--
branch : HEAD

diff --git a/doc/dovecot-ldap.conf b/doc/dovecot-ldap.conf
index f901a590dda231aafbb25cd2e14825850ec44b4a..42762bdfbf25afa72def629106a8686eaf358e78 100644 (file)
--- a/doc/dovecot-ldap.conf
+++ b/doc/dovecot-ldap.conf
@@ -34,10 +34,11 @@ base = uid=someone, dc=foo, dc=bar, dc=org
 #  Virtual user name (user@domain)
 #  Home directory
 #  MAIL environment
-#  System user name (for initgroups())
+#  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,,uid,uidNumber,gidNumber
+#user_attrs = uid,homeDirectory,,,uidNumber,gidNumber
 
 # Filter for user lookup. Some variables can be used:
 #   %u - username

diff --git a/doc/dovecot-pgsql.conf b/doc/dovecot-pgsql.conf
index f37e321355d68a8fb45652dd375f653c663b3777..0619f9d4f98e02dd11ed67f7380ceb9ee85d0e08 100644 (file)
--- a/doc/dovecot-pgsql.conf
+++ b/doc/dovecot-pgsql.conf
@@ -58,7 +58,7 @@
 # The query must return only one row. The columns to return are:
 #   home - Home directory
 #   mail - MAIL environment
-#   system_user - System user name (for initgroups())
+#   system_user - System user name (for getting user's groups from /etc/group)
 #   uid - System UID
 #   gid - System GID
 #

diff --git a/src/auth/userdb-ldap.c b/src/auth/userdb-ldap.c
index f13afb8d5f195dde833bc821bb95c50d6bd1c135..7086d41e804a95dea5929e0a75e837015fbc2de1 100644 (file)
--- a/src/auth/userdb-ldap.c
+++ b/src/auth/userdb-ldap.c
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 
 /* using posixAccount */
-#define DEFAULT_ATTRIBUTES "uid,homeDirectory,,uid,uidNumber,gidNumber"
+#define DEFAULT_ATTRIBUTES "uid,homeDirectory,,,uidNumber,gidNumber"
 
 enum ldap_user_attr {
        ATTR_VIRTUAL_USER = 0,