Mercurial > dovecot > original-hg > dovecot-1.2
diff src/auth/db-ldap.c @ 5872:93bd157917ca HEAD
Changed userdb callback API. Don't require uid/gid to be returned by userdb.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 03 Jul 2007 03:20:06 +0300 |
| parents | 522c50117d5d |
| children | 1c1dee40e495 |
line wrap: on
line diff
--- a/src/auth/db-ldap.c Tue Jul 03 01:59:06 2007 +0300 +++ b/src/auth/db-ldap.c Tue Jul 03 03:20:06 2007 +0300 @@ -66,8 +66,6 @@ DEF_STR(pass_attrs), DEF_STR(pass_filter), DEF_STR(default_pass_scheme), - DEF_STR(user_global_uid), - DEF_STR(user_global_gid), { 0, NULL, 0 } }; @@ -92,9 +90,7 @@ MEMBER(user_filter) "(&(objectClass=posixAccount)(uid=%u))", MEMBER(pass_attrs) "uid,userPassword", MEMBER(pass_filter) "(&(objectClass=posixAccount)(uid=%u))", - MEMBER(default_pass_scheme) "crypt", - MEMBER(user_global_uid) "", - MEMBER(user_global_gid) "" + MEMBER(default_pass_scheme) "crypt" }; static struct ldap_connection *ldap_connections = NULL; @@ -737,28 +733,6 @@ conn->set.ldap_deref = deref2str(conn->set.deref); conn->set.ldap_scope = scope2str(conn->set.scope); - if (*conn->set.user_global_uid == '\0') - conn->set.uid = (uid_t)-1; - else { - conn->set.uid = - userdb_parse_uid(NULL, conn->set.user_global_uid); - if (conn->set.uid == (uid_t)-1) { - i_fatal("LDAP: Invalid user_global_uid: %s", - conn->set.user_global_uid); - } - } - - if (*conn->set.user_global_gid == '\0') - conn->set.gid = (gid_t)-1; - else { - conn->set.gid = - userdb_parse_gid(NULL, conn->set.user_global_gid); - if (conn->set.gid == (gid_t)-1) { - i_fatal("LDAP: Invalid user_global_gid: %s", - conn->set.user_global_gid); - } - } - conn->next = ldap_connections; ldap_connections = conn; return conn;