← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/lib-dict/dict-sql-settings.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/lib-dict/dict-sql-settings.c
1
 
/* Copyright (c) 2008-2012 Dovecot authors, see the included COPYING file */
 
1
/* Copyright (c) 2008-2013 Dovecot authors, see the included COPYING file */
2
2
 
3
3
#include "lib.h"
4
4
#include "array.h"
24
24
        enum section_type type;
25
25
 
26
26
        struct dict_sql_map cur_map;
27
 
        ARRAY_DEFINE(cur_fields, struct dict_sql_map_field);
 
27
        ARRAY(struct dict_sql_map_field) cur_fields;
28
28
};
29
29
 
30
30
#define DEF_STR(name) DEF_STRUCT_STR(name, dict_sql_map)
210
210
        return FALSE;
211
211
}
212
212
 
213
 
struct dict_sql_settings *dict_sql_settings_read(pool_t pool, const char *path)
 
213
struct dict_sql_settings *
 
214
dict_sql_settings_read(pool_t pool, const char *path, const char **error_r)
214
215
{
215
216
        struct setting_parser_ctx ctx;
216
217
 
220
221
        t_array_init(&ctx.cur_fields, 16);
221
222
        p_array_init(&ctx.set->maps, pool, 8);
222
223
 
223
 
        if (!settings_read(path, NULL, parse_setting, parse_section, &ctx))
 
224
        if (!settings_read(path, NULL, parse_setting, parse_section,
 
225
                           &ctx, error_r))
224
226
                return NULL;
225
227
 
226
228
        if (ctx.set->connect == NULL) {
227
 
                i_error("Error in configuration file %s: "
228
 
                        "Missing connect setting", path);
 
229
                *error_r = t_strdup_printf("Error in configuration file %s: "
 
230
                                           "Missing connect setting", path);
229
231
                return NULL;
230
232
        }
231
233