← Back to branch summary

~ubuntu-branches/ubuntu/utopic/dovecot/utopic-proposed

« back to all changes in this revision

Viewing changes to src/auth/userdb-ldap.c

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (4.1.35 sid)
  • Revision ID: package-import@ubuntu.com-20140108093549-i72o93pux8p0dlaf
Tags: 1:2.2.9-1ubuntu1
* Merge from Debian unstable, remaining changes:
  + Add mail-stack-delivery package:
    - Update d/rules
    - d/control: convert existing dovecot-postfix package to a dummy
      package and add new mail-stack-delivery package.
    - Update maintainer scripts.
    - Rename d/dovecot-postfix.* to debian/mail-stack-delivery.*
    - d/mail-stack-delivery.preinst: Move previously installed backups and
      config files to a new package namespace.
    - d/mail-stack-delivery.prerm: Added to handle downgrades.
  + Use Snakeoil SSL certificates by default:
    - d/control: Depend on ssl-cert.
    - d/dovecot-core.postinst: Relax grep for SSL_* a bit.
  + Add autopkgtest to debian/tests/*.
  + Add ufw integration:
    - d/dovecot-core.ufw.profile: new ufw profile.
    - d/rules: install profile in dovecot-core.
    - d/control: dovecot-core - suggest ufw.
  + d/dovecot-core.dirs: Added usr/share/doc/dovecot-core
  + Add apport hook:
    - d/rules, d/source_dovecot.py
  + Add upstart job:
    - d/rules, d/dovecot-core.dovecot.upstart, d/control,
      d/dovecot-core.dirs, dovecot-imapd.{postrm, postinst, prerm},
      d/dovecot-pop3d.{postinst, postrm, prerm}.
      d/mail-stack-deliver.postinst: Convert init script to upstart.
  + Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.
* Dropped changes, included in Debian:
  - Update Dovecot name to reflect distribution in login greeting.
  - Update Drac plugin for >= 2.0.0 support.
* d/control: Drop dovecot-postfix package as its no longer required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/auth/userdb-ldap.c
1
 
/* Copyright (c) 2003-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2003-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "auth-common.h"
4
4
#include "userdb.h"
42
42
};
43
43
 
44
44
static void
45
 
ldap_query_get_result(struct ldap_connection *conn, LDAPMessage *entry,
46
 
                      struct auth_request *auth_request)
 
45
ldap_query_get_result(struct ldap_connection *conn,
 
46
                      struct auth_request *auth_request,
 
47
                      struct ldap_request_search *ldap_request,
 
48
                      LDAPMessage *res)
47
49
{
48
50
        struct db_ldap_result_iterate_context *ldap_iter;
49
51
        const char *name, *const *values;
50
52
 
51
53
        auth_request_init_userdb_reply(auth_request);
52
54
 
53
 
        ldap_iter = db_ldap_result_iterate_init(conn, entry, auth_request,
54
 
                                                &conn->user_attr_map);
 
55
        ldap_iter = db_ldap_result_iterate_init(conn, ldap_request, res, TRUE);
55
56
        while (db_ldap_result_iterate_next(ldap_iter, &name, &values)) {
56
57
                auth_request_set_userdb_field_values(auth_request,
57
58
                                                     name, values);
70
71
                result = USERDB_RESULT_INTERNAL_FAILURE;
71
72
        } else if (urequest->entries == 0) {
72
73
                result = USERDB_RESULT_USER_UNKNOWN;
73
 
                auth_request_log_info(auth_request, "ldap",
74
 
                                      "unknown user");
 
74
                auth_request_log_unknown_user(auth_request, "ldap");
75
75
        } else if (urequest->entries > 1) {
76
76
                auth_request_log_error(auth_request, "ldap",
77
77
                        "user_filter matched multiple objects, aborting");
100
100
 
101
101
        if (urequest->entries++ == 0) {
102
102
                /* first entry */
103
 
                ldap_query_get_result(conn, res, auth_request);
 
103
                ldap_query_get_result(conn, auth_request,
 
104
                                      &urequest->request, res);
104
105
        }
105
106
}
106
107
 
130
131
        var_expand(str, conn->set.user_filter, vars);
131
132
        request->request.filter = p_strdup(auth_request->pool, str_c(str));
132
133
 
 
134
        request->request.attr_map = &conn->user_attr_map;
133
135
        request->request.attributes = conn->user_attr_names;
134
136
 
135
137
        auth_request_log_debug(auth_request, "ldap", "user search: "
166
168
        request->create_time = ioloop_time;
167
169
 
168
170
        ctx->in_callback = TRUE;
169
 
        ldap_iter = db_ldap_result_iterate_init(conn, res,
170
 
                                                request->auth_request,
171
 
                                                &conn->iterate_attr_map);
 
171
        ldap_iter = db_ldap_result_iterate_init(conn, &urequest->request,
 
172
                                                res, TRUE);
172
173
        while (db_ldap_result_iterate_next(ldap_iter, &name, &values)) {
173
174
                if (strcmp(name, "user") != 0) {
174
175
                        i_warning("ldap: iterate: "
220
221
        str_truncate(str, 0);
221
222
        var_expand(str, conn->set.iterate_filter, vars);
222
223
        request->request.filter = p_strdup(auth_request->pool, str_c(str));
 
224
        request->request.attr_map = &conn->iterate_attr_map;
223
225
        request->request.attributes = conn->iterate_attr_names;
 
226
        request->request.multi_entry = TRUE;
224
227
 
225
228
        if (global_auth_settings->debug) {
226
229
                i_debug("ldap: iterate: base=%s scope=%s filter=%s fields=%s",