← Back to branch summary

~ubuntu-branches/ubuntu/trusty/dovecot/trusty

« back to all changes in this revision

Viewing changes to src/lib-master/master-service-settings.h

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-01-08 09:35:49 UTC
  • mfrom: (1.15.3) (96.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20140108093549-814nkqdcxfbvgktg
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-master/master-service-settings.h
1
1
#ifndef MASTER_SERVICE_SETTINGS_H
2
2
#define MASTER_SERVICE_SETTINGS_H
3
3
 
4
 
#include "network.h"
 
4
#include "net.h"
5
5
 
6
6
struct setting_parser_info;
 
7
struct setting_parser_context;
7
8
struct master_service;
8
9
 
9
10
struct master_service_settings {
 
11
        const char *base_dir;
 
12
        const char *state_dir;
10
13
        const char *log_path;
11
14
        const char *info_log_path;
12
15
        const char *debug_log_path;
49
52
           local/remote ip/host */
50
53
        unsigned int used_local:1;
51
54
        unsigned int used_remote:1;
 
55
        /* Config couldn't be read because we don't have enough permissions.
 
56
           The process probably should be restarted and the settings read
 
57
           before dropping privileges. */
 
58
        unsigned int permission_denied:1;
52
59
};
53
60
 
54
61
extern const struct setting_parser_info master_service_setting_parser_info;
55
62
 
 
63
/* Try to open the config socket if it's going to be needed later by
 
64
   master_service_settings_read*() */
 
65
void master_service_config_socket_try_open(struct master_service *service);
56
66
int master_service_settings_read(struct master_service *service,
57
67
                                 const struct master_service_settings_input *input,
58
68
                                 struct master_service_settings_output *output_r,
59
69
                                 const char **error_r);
60
70
int master_service_settings_read_simple(struct master_service *service,
61
71
                                        const struct setting_parser_info **roots,
62
 
                                        const char **error_r);
 
72
                                        const char **error_r) ATTR_NULL(2);
63
73
/* destroy settings parser and clear service's set_pool, so that
64
74
   master_service_settings_read*() can be called without freeing memory used
65
75
   by existing settings structures. */
68
78
const struct master_service_settings *
69
79
master_service_settings_get(struct master_service *service);
70
80
void **master_service_settings_get_others(struct master_service *service);
 
81
void **master_service_settings_parser_get_others(struct master_service *service,
 
82
                                                 const struct setting_parser_context *set_parser);
71
83
struct setting_parser_context *
72
84
master_service_get_settings_parser(struct master_service *service);
73
85