← Back to branch summary

~ubuntu-dev/ubuntu/lucid/dovecot/lucid-201002101901

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-05-26 09:51:01 UTC
  • mfrom: (1.10.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20080526095101-y0zxqc8ofd9j1aa5
Tags: 1:1.0.13-4ubuntu1
https://launchpad.net/bugs/153161
https://launchpad.net/bugs/208411
https://launchpad.net/bugs/189616
* Merge from debian unstable, remaining changes:
  - DebainMaintainerField
  - Use Snakeoil SSL certificate by default.
    + debian/control: Depend on ssl-cert
    + debian/patches/ssl-cert-snakeoil.dpatch: Change default SSL cert paths
      to snakeoil.
    + debian/dovecot-common.postinst: Relax grep for SSL_* a bit.
  - Fast TearDown:
    + debian/rules: Call dh_installinit in 'multiuser' mode.
    + debian/control: Depend on newer sysv-rc for this.
    + debian/dovecot-common.postinst: Remove stp script symlinks from rc0 and rc6 on upgrades.
      Need to be kept unil next LTS release.
  - Add autopkgtest in debian/tests/*.
  - Don't fail in postinst if dovecot-{sql,ldap} is missing. (LP: #153161)
  - Dropped upstream-mail-group-fixes.dpatch. No longer needed.
  - Dropped upstream-invalid-password-fixes.dpatch. No longer needed.
  - debian/dovecot-common.init: Check to see if there is an /etc/inetd.conf. (LP: #208411)
  - debian/patches/login-max-processes-count-warning.dpatch: Tell the user
    that they have reached the maxium number of processes count. (LP: #189616)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/auth/userdb-blocking.c
19
19
                result = USERDB_RESULT_USER_UNKNOWN;
20
20
        else if (strncmp(reply, "OK\t", 3) == 0) {
21
21
                result = USERDB_RESULT_OK;
22
 
                stream_reply = auth_stream_reply_init(request);
 
22
                stream_reply = auth_stream_reply_init(request->pool);
23
23
                auth_stream_reply_import(stream_reply, reply + 3);
24
24
        } else {
25
25
                result = USERDB_RESULT_INTERNAL_FAILURE;
31
31
 
32
32
void userdb_blocking_lookup(struct auth_request *request)
33
33
{
34
 
        string_t *str;
35
 
 
36
 
        str = t_str_new(64);
37
 
        str_printfa(str, "USER\t%u\t", request->userdb->num);
38
 
        auth_request_export(request, str);
39
 
 
40
 
        auth_worker_call(request, str_c(str), user_callback);
 
34
        struct auth_stream_reply *reply;
 
35
 
 
36
        reply = auth_stream_reply_init(pool_datastack_create());
 
37
        auth_stream_reply_add(reply, "USER", NULL);
 
38
        auth_stream_reply_add(reply, NULL, dec2str(request->userdb->num));
 
39
        auth_request_export(request, reply);
 
40
 
 
41
        auth_worker_call(request, reply, user_callback);
41
42
}