From: Timo Sirainen <tss@iki.fi>
Date: Sun, 24 Aug 2003 05:55:05 +0000 (+0300)
Subject: LDAP: Removed the system_user=uid defaulting. LDAP usually has only virtual
X-Git-Tag: 1.1.alpha1~4390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c067f92edf6bc5bba2b3b6216a9b3525cd173eae;p=thirdparty%2Fdovecot%2Fcore.git

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 f901a590dd..42762bdfbf 100644
--- 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 f37e321355..0619f9d4f9 100644
--- 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 f13afb8d5f..7086d41e80 100644
--- 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,