← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/auth/userdb-passwd-file.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-passwd-file.c
1
 
/* Copyright (c) 2002-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2002-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "auth-common.h"
4
4
#include "userdb.h"
20
20
        struct userdb_iterate_context ctx;
21
21
        struct istream *input;
22
22
        char *path;
 
23
        bool skip_passdb_entries;
23
24
};
24
25
 
25
26
struct passwd_file_userdb_module {
43
44
 
44
45
        pu = db_passwd_file_lookup(module->pwf, auth_request,
45
46
                                   module->username_format);
46
 
        if (pu == NULL) {
 
47
        if (pu == NULL || pu->uid == 0) {
47
48
                callback(USERDB_RESULT_USER_UNKNOWN, auth_request);
48
49
                return;
49
50
        }
98
99
        ctx->ctx.auth_request = auth_request;
99
100
        ctx->ctx.callback = callback;
100
101
        ctx->ctx.context = context;
 
102
        ctx->skip_passdb_entries = !module->pwf->userdb_warn_missing;
101
103
        if (module->pwf->default_file == NULL) {
102
104
                i_error("passwd-file: User iteration isn't currently supported "
103
105
                        "with %%variable paths");
121
123
{
122
124
        struct passwd_file_userdb_iterate_context *ctx =
123
125
                (struct passwd_file_userdb_iterate_context *)_ctx;
124
 
        const char *line;
 
126
        const char *line, *p;
125
127
 
126
128
        if (ctx->input == NULL)
127
129
                line = NULL;
129
131
                while ((line = i_stream_read_next_line(ctx->input)) != NULL) {
130
132
                        if (*line == '\0' || *line == ':' || *line == '#')
131
133
                                continue; /* no username or comment */
 
134
                        if (ctx->skip_passdb_entries &&
 
135
                            ((p = strchr(line, ':')) == NULL ||
 
136
                             strchr(p+1, ':') == NULL)) {
 
137
                                /* only passdb info */
 
138
                                continue;
 
139
                        }
132
140
                        break;
133
141
                }
134
142
                if (line == NULL && ctx->input->stream_errno != 0) {