]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
Removed MEMBER() macro. Require C99 style struct initializer.
authorTimo Sirainen <tss@iki.fi>
Fri, 4 Dec 2009 19:52:35 +0000 (13:52 -0600)
committerTimo Sirainen <tss@iki.fi>
Fri, 4 Dec 2009 19:52:35 +0000 (13:52 -0600)
--HG--
branch : HEAD

92 files changed:
src/anvil/anvil-settings.c
src/auth/auth-settings.c
src/auth/auth.c
src/auth/db-ldap.c
src/auth/db-sql.c
src/auth/mech-anonymous.c
src/auth/mech-apop.c
src/auth/mech-cram-md5.c
src/auth/mech-digest-md5.c
src/auth/mech-external.c
src/auth/mech-gssapi.c
src/auth/mech-login.c
src/auth/mech-ntlm.c
src/auth/mech-otp.c
src/auth/mech-plain.c
src/auth/mech-rpa.c
src/auth/mech-skey.c
src/auth/mech-winbind.c
src/auth/passdb-bsdauth.c
src/auth/passdb-checkpassword.c
src/auth/passdb-ldap.c
src/auth/passdb-pam.c
src/auth/passdb-passwd-file.c
src/auth/passdb-passwd.c
src/auth/passdb-shadow.c
src/auth/passdb-sia.c
src/auth/passdb-sql.c
src/auth/passdb-vpopmail.c
src/auth/userdb-checkpassword.c
src/auth/userdb-ldap.c
src/auth/userdb-nss.c
src/auth/userdb-passwd-file.c
src/auth/userdb-passwd.c
src/auth/userdb-prefetch.c
src/auth/userdb-sql.c
src/auth/userdb-static.c
src/auth/userdb-vpopmail.c
src/config/config-settings.c
src/dict/dict-settings.c
src/imap-login/imap-login-settings.c
src/imap/imap-settings.c
src/lib-dict/dict-client.c
src/lib-dict/dict-db.c
src/lib-dict/dict-file.c
src/lib-dict/dict-sql.c
src/lib-index/mail-index-strmap.c
src/lib-index/mailbox-list-index.c
src/lib-lda/duplicate.c
src/lib-lda/lda-settings.c
src/lib-master/master-service-settings.c
src/lib-settings/settings-parser.c
src/lib-sql/driver-mysql.c
src/lib-sql/driver-pgsql.c
src/lib-sql/driver-sqlite.c
src/lib-sql/sql-api.c
src/lib-storage/index/cydir/cydir-storage.c
src/lib-storage/index/dbox-multi/mdbox-settings.c
src/lib-storage/index/dbox-multi/mdbox-storage.c
src/lib-storage/index/dbox-single/sdbox-storage.c
src/lib-storage/index/maildir/maildir-settings.c
src/lib-storage/index/maildir/maildir-storage.c
src/lib-storage/index/mbox/mbox-settings.c
src/lib-storage/index/mbox/mbox-storage.c
src/lib-storage/index/raw/raw-storage.c
src/lib-storage/index/shared/shared-list.c
src/lib-storage/index/shared/shared-storage.c
src/lib-storage/list/mailbox-list-fs.c
src/lib-storage/list/mailbox-list-maildir.c
src/lib-storage/mail-storage-settings.c
src/lib-storage/test-mail-storage.c
src/lib-storage/test-mailbox.c
src/lib/macros.h
src/lib/mempool-alloconly.c
src/lib/mempool-datastack.c
src/lib/mempool-system-clean.c
src/lib/mempool-system.c
src/lib/mempool-unsafe-datastack.c
src/lmtp/lmtp-settings.c
src/log/log-settings.c
src/login-common/login-settings.c
src/master/master-settings.c
src/plugins/acl/acl-backend-vfile.c
src/plugins/convert/convert-storage.c
src/plugins/fts-lucene/fts-backend-lucene.c
src/plugins/fts-solr/fts-backend-solr.c
src/plugins/fts-squat/fts-backend-squat.c
src/plugins/quota/quota-maildir.c
src/plugins/virtual/virtual-storage.c
src/pop3-login/pop3-login-settings.c
src/pop3/pop3-settings.c
src/ssl-params/ssl-params-settings.c
src/util/maildirlock.c

index e268a907ca97f94eeb79a903369c45581bf2f45f..cbc38f7d22fee1f75df7c917ea372a91a91a4470 100644 (file)
@@ -22,26 +22,26 @@ static buffer_t anvil_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings anvil_service_settings = {
-       MEMBER(name) "anvil",
-       MEMBER(protocol) "",
-       MEMBER(type) "anvil",
-       MEMBER(executable) "anvil",
-       MEMBER(user) "dovecot",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "empty",
+       .name = "anvil",
+       .protocol = "",
+       .type = "anvil",
+       .executable = "anvil",
+       .user = "dovecot",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "empty",
 
-       MEMBER(drop_priv_before_exec) FALSE,
+       .drop_priv_before_exec = FALSE,
 
-       MEMBER(process_min_avail) 1,
-       MEMBER(process_limit) 1,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
+       .process_min_avail = 1,
+       .process_limit = 1,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
 
-       MEMBER(unix_listeners) { { &anvil_unix_listeners_buf,
-                                  sizeof(anvil_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .unix_listeners = { { &anvil_unix_listeners_buf,
+                             sizeof(anvil_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
index 76497871b79f0e3de3e4d21bba5391566b9501cf..fb0b1a9c8b7bd1a6862077d284a7b8bf7d508922 100644 (file)
@@ -31,28 +31,28 @@ static buffer_t auth_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings auth_service_settings = {
-       MEMBER(name) "auth",
-       MEMBER(protocol) "",
-       MEMBER(type) "",
-       MEMBER(executable) "auth",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 1,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
-
-       MEMBER(unix_listeners) { { &auth_unix_listeners_buf,
-                                  sizeof(auth_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "auth",
+       .protocol = "",
+       .type = "",
+       .executable = "auth",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 1,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
+
+       .unix_listeners = { { &auth_unix_listeners_buf,
+                             sizeof(auth_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 /* <settings checks> */
@@ -68,28 +68,28 @@ static buffer_t auth_worker_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings auth_worker_service_settings = {
-       MEMBER(name) "auth-worker",
-       MEMBER(protocol) "",
-       MEMBER(type) "",
-       MEMBER(executable) "auth -w",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 1,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
-
-       MEMBER(unix_listeners) { { &auth_worker_unix_listeners_buf,
-                                  sizeof(auth_worker_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "auth-worker",
+       .protocol = "",
+       .type = "",
+       .executable = "auth -w",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 1,
+       .service_count = 0,
+       .vsz_limit = -1U,
+
+       .unix_listeners = { { &auth_worker_unix_listeners_buf,
+                             sizeof(auth_worker_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -105,15 +105,13 @@ static const struct setting_define auth_passdb_setting_defines[] = {
 };
 
 const struct setting_parser_info auth_passdb_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) auth_passdb_setting_defines,
-       MEMBER(defaults) NULL,
+       .defines = auth_passdb_setting_defines,
 
-       MEMBER(type_offset) offsetof(struct auth_passdb_settings, driver),
-       MEMBER(struct_size) sizeof(struct auth_passdb_settings),
+       .type_offset = offsetof(struct auth_passdb_settings, driver),
+       .struct_size = sizeof(struct auth_passdb_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &auth_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &auth_setting_parser_info
 };
 
 #undef DEF
@@ -128,15 +126,13 @@ static const struct setting_define auth_userdb_setting_defines[] = {
 };
 
 const struct setting_parser_info auth_userdb_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) auth_userdb_setting_defines,
-       MEMBER(defaults) NULL,
+       .defines = auth_userdb_setting_defines,
 
-       MEMBER(type_offset) offsetof(struct auth_userdb_settings, driver),
-       MEMBER(struct_size) sizeof(struct auth_userdb_settings),
+       .type_offset = offsetof(struct auth_userdb_settings, driver),
+       .struct_size = sizeof(struct auth_userdb_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &auth_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &auth_setting_parser_info
 };
 
 /* we're kind of kludging here to avoid "auth_" prefix in the struct fields */
@@ -180,47 +176,46 @@ static const struct setting_define auth_setting_defines[] = {
 };
 
 static const struct auth_settings auth_default_settings = {
-       MEMBER(mechanisms) "plain",
-       MEMBER(realms) "",
-       MEMBER(default_realm) "",
-       MEMBER(cache_size) 0,
-       MEMBER(cache_ttl) 60*60,
-       MEMBER(cache_negative_ttl) 0,
-       MEMBER(username_chars) "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
-       MEMBER(username_translation) "",
-       MEMBER(username_format) "",
-       MEMBER(master_user_separator) "",
-       MEMBER(anonymous_username) "anonymous",
-       MEMBER(krb5_keytab) "",
-       MEMBER(gssapi_hostname) "",
-       MEMBER(winbind_helper_path) "/usr/bin/ntlm_auth",
-       MEMBER(failure_delay) 2,
-
-       MEMBER(verbose) FALSE,
-       MEMBER(debug) FALSE,
-       MEMBER(debug_passwords) FALSE,
-       MEMBER(ssl_require_client_cert) FALSE,
-       MEMBER(ssl_username_from_cert) FALSE,
-       MEMBER(use_winbind) FALSE,
-
-       MEMBER(worker_max_count) 30,
-
-       MEMBER(passdbs) ARRAY_INIT,
-       MEMBER(userdbs) ARRAY_INIT
+       .mechanisms = "plain",
+       .realms = "",
+       .default_realm = "",
+       .cache_size = 0,
+       .cache_ttl = 60*60,
+       .cache_negative_ttl = 0,
+       .username_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
+       .username_translation = "",
+       .username_format = "",
+       .master_user_separator = "",
+       .anonymous_username = "anonymous",
+       .krb5_keytab = "",
+       .gssapi_hostname = "",
+       .winbind_helper_path = "/usr/bin/ntlm_auth",
+       .failure_delay = 2,
+
+       .verbose = FALSE,
+       .debug = FALSE,
+       .debug_passwords = FALSE,
+       .ssl_require_client_cert = FALSE,
+       .ssl_username_from_cert = FALSE,
+       .use_winbind = FALSE,
+
+       .worker_max_count = 30,
+
+       .passdbs = ARRAY_INIT,
+       .userdbs = ARRAY_INIT
 };
 
 const struct setting_parser_info auth_setting_parser_info = {
-       MEMBER(module_name) "auth",
-       MEMBER(defines) auth_setting_defines,
-       MEMBER(defaults) &auth_default_settings,
+       .module_name = "auth",
+       .defines = auth_setting_defines,
+       .defaults = &auth_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct auth_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct auth_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) auth_settings_check
+       .check_func = auth_settings_check
 };
 
 /* <settings checks> */
index ec360adbac74383c3737c5cdae327eeeff7c5309..e3c9575f637a5fa5d38b529ae7f126db18aa2bb9 100644 (file)
@@ -19,8 +19,8 @@
 #define AUTH_PENALTY_ANVIL_PATH "anvil-auth-penalty"
 
 struct auth_userdb_settings userdb_dummy_set = {
-       MEMBER(driver) "static",
-       MEMBER(args) ""
+       .driver = "static",
+       .args = ""
 };
 
 struct auth *auth_preinit(struct auth_settings *set)
index 9f08cda186784cef00534dfaa6af2afa2f7993ca..a87135416855021386397eaa80baff7802e6451c 100644 (file)
@@ -113,36 +113,36 @@ static struct setting_def setting_defs[] = {
 };
 
 static struct ldap_settings default_ldap_settings = {
-       MEMBER(hosts) NULL,
-       MEMBER(uris) NULL,
-       MEMBER(dn) NULL,
-       MEMBER(dnpass) NULL,
-       MEMBER(auth_bind) FALSE,
-       MEMBER(auth_bind_userdn) NULL,
-       MEMBER(tls) FALSE,
-       MEMBER(sasl_bind) FALSE,
-       MEMBER(sasl_mech) NULL,
-       MEMBER(sasl_realm) NULL,
-       MEMBER(sasl_authz_id) NULL,
-       MEMBER(tls_ca_cert_file) NULL,
-       MEMBER(tls_ca_cert_dir) NULL,
-       MEMBER(tls_cert_file) NULL,
-       MEMBER(tls_key_file) NULL,
-       MEMBER(tls_cipher_suite) NULL,
-       MEMBER(tls_require_cert) NULL,
-       MEMBER(deref) "never",
-       MEMBER(scope) "subtree",
-       MEMBER(base) NULL,
-       MEMBER(ldap_version) 3,
-       MEMBER(debug_level) "0",
-       MEMBER(ldaprc_path) "",
-       MEMBER(user_attrs) "homeDirectory=home,uidNumber=uid,gidNumber=gid",
-       MEMBER(user_filter) "(&(objectClass=posixAccount)(uid=%u))",
-       MEMBER(pass_attrs) "uid=user,userPassword=password",
-       MEMBER(pass_filter) "(&(objectClass=posixAccount)(uid=%u))",
-       MEMBER(iterate_attrs) "uid=user",
-       MEMBER(iterate_filter) "(objectClass=posixAccount)",
-       MEMBER(default_pass_scheme) "crypt"
+       .hosts = NULL,
+       .uris = NULL,
+       .dn = NULL,
+       .dnpass = NULL,
+       .auth_bind = FALSE,
+       .auth_bind_userdn = NULL,
+       .tls = FALSE,
+       .sasl_bind = FALSE,
+       .sasl_mech = NULL,
+       .sasl_realm = NULL,
+       .sasl_authz_id = NULL,
+       .tls_ca_cert_file = NULL,
+       .tls_ca_cert_dir = NULL,
+       .tls_cert_file = NULL,
+       .tls_key_file = NULL,
+       .tls_cipher_suite = NULL,
+       .tls_require_cert = NULL,
+       .deref = "never",
+       .scope = "subtree",
+       .base = NULL,
+       .ldap_version = 3,
+       .debug_level = "0",
+       .ldaprc_path = "",
+       .user_attrs = "homeDirectory=home,uidNumber=uid,gidNumber=gid",
+       .user_filter = "(&(objectClass=posixAccount)(uid=%u))",
+       .pass_attrs = "uid=user,userPassword=password",
+       .pass_filter = "(&(objectClass=posixAccount)(uid=%u))",
+       .iterate_attrs = "uid=user",
+       .iterate_filter = "(objectClass=posixAccount)",
+       .default_pass_scheme = "crypt"
 };
 
 static struct ldap_connection *ldap_connections = NULL;
index 1a651f5e3b406623c6f4370d8ca11cc03cc12b62..2506943a8edecaecb2d10bfb0d6699a26a64e10e 100644 (file)
@@ -28,13 +28,13 @@ static struct setting_def setting_defs[] = {
 };
 
 static struct sql_settings default_sql_settings = {
-       MEMBER(driver) NULL,
-       MEMBER(connect) NULL,
-       MEMBER(password_query) "SELECT username, domain, password FROM users WHERE username = '%n' AND domain = '%d'",
-       MEMBER(user_query) "SELECT home, uid, gid FROM users WHERE username = '%n' AND domain = '%d'",
-       MEMBER(update_query) "UPDATE users SET password = '%w' WHERE username = '%n' AND domain = '%d'",
-       MEMBER(iterate_query) "SELECT username, domain FROM users",
-       MEMBER(default_pass_scheme) "MD5"
+       .driver = NULL,
+       .connect = NULL,
+       .password_query = "SELECT username, domain, password FROM users WHERE username = '%n' AND domain = '%d'",
+       .user_query = "SELECT home, uid, gid FROM users WHERE username = '%n' AND domain = '%d'",
+       .update_query = "UPDATE users SET password = '%w' WHERE username = '%n' AND domain = '%d'",
+       .iterate_query = "SELECT username, domain FROM users",
+       .default_pass_scheme = "MD5"
 };
 
 static struct sql_connection *connections = NULL;
index ad8c8ec0363b43385bdbba9c4eace8b706613c4a..0e1605473b6280add51399dac8409d455dc9a9cc 100644 (file)
@@ -37,8 +37,8 @@ static struct auth_request *mech_anonymous_auth_new(void)
 const struct mech_module mech_anonymous = {
        "ANONYMOUS",
 
-       MEMBER(flags) MECH_SEC_ANONYMOUS,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_NOTHING,
+       .flags = MECH_SEC_ANONYMOUS,
+       .passdb_need = MECH_PASSDB_NEED_NOTHING,
 
        mech_anonymous_auth_new,
        mech_generic_auth_initial,
index 8e2b55965806e1c04be15b36a5a7fb3b61ee8b87..a3c4026bc3dcde3c4204981fc12992077db1a7e2 100644 (file)
@@ -155,8 +155,8 @@ static struct auth_request *mech_apop_auth_new(void)
 const struct mech_module mech_apop = {
        "APOP",
 
-       MEMBER(flags) MECH_SEC_PRIVATE | MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_VERIFY_RESPONSE,
+       .flags = MECH_SEC_PRIVATE | MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_VERIFY_RESPONSE,
 
        mech_apop_auth_new,
        mech_apop_auth_initial,
index 6c92c11322d6b2a5022796f8f5d74329c4ef9538..0837fbab73977e6d5793e8180f854430036307e8 100644 (file)
@@ -181,8 +181,8 @@ static struct auth_request *mech_cram_md5_auth_new(void)
 const struct mech_module mech_cram_md5 = {
        "CRAM-MD5",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_VERIFY_RESPONSE,
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_VERIFY_RESPONSE,
 
        mech_cram_md5_auth_new,
        mech_cram_md5_auth_initial,
index d6e34fbd0a4819d7d9119d34161838a65117f363..16d303bb772cd0789e59265932ea0b50fecf8b9c 100644 (file)
@@ -591,9 +591,9 @@ static struct auth_request *mech_digest_md5_auth_new(void)
 const struct mech_module mech_digest_md5 = {
        "DIGEST-MD5",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
                MECH_SEC_MUTUAL_AUTH,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
+       .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
 
        mech_digest_md5_auth_new,
        mech_digest_md5_auth_initial,
index 92a48344cb567211fc3683e70864b3b8fb0aab59..67e4151949f7e1afc490b93209748bec93f55af0 100644 (file)
@@ -42,8 +42,8 @@ static struct auth_request *mech_external_auth_new(void)
 const struct mech_module mech_external = {
        "EXTERNAL",
 
-       MEMBER(flags) 0,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_VERIFY_PLAIN,
+       .flags = 0,
+       .passdb_need = MECH_PASSDB_NEED_VERIFY_PLAIN,
 
        mech_external_auth_new,
        mech_generic_auth_initial,
index 80ce19e87c2c3f07bcc9dba1902c10573c275df0..54864951654a77dcb9bd4f895dbcb01b88c3483b 100644 (file)
@@ -633,8 +633,8 @@ mech_gssapi_auth_free(struct auth_request *request)
 const struct mech_module mech_gssapi = {
        "GSSAPI",
 
-       MEMBER(flags) 0,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_NOTHING,
+       .flags = 0,
+       .passdb_need = MECH_PASSDB_NEED_NOTHING,
 
        mech_gssapi_auth_new,
        mech_gssapi_auth_initial,
@@ -648,8 +648,8 @@ const struct mech_module mech_gssapi = {
 const struct mech_module mech_gssapi_spnego = {
        "GSS-SPNEGO",
 
-       MEMBER(flags) 0,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_NOTHING,
+       .flags = 0,
+       .passdb_need = MECH_PASSDB_NEED_NOTHING,
 
        mech_gssapi_auth_new,
         mech_gssapi_auth_initial,
index 4305a6f3fed68fd9bc2479acd649f61492f14ef1..225c942bca4aaa7d4c280acf600a9717e7a8fbbd 100644 (file)
@@ -66,8 +66,8 @@ static struct auth_request *mech_login_auth_new(void)
 const struct mech_module mech_login = {
        "LOGIN",
 
-       MEMBER(flags) MECH_SEC_PLAINTEXT,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_VERIFY_PLAIN,
+       .flags = MECH_SEC_PLAINTEXT,
+       .passdb_need = MECH_PASSDB_NEED_VERIFY_PLAIN,
 
        mech_login_auth_new,
        mech_login_auth_initial,
index 02199e835970a335ca9dd60a25649d7a1deeb9a6..87e8fac155af0536ed3f26b8905ab3b630a9cd73 100644 (file)
@@ -250,8 +250,8 @@ static struct auth_request *mech_ntlm_auth_new(void)
 const struct mech_module mech_ntlm = {
        "NTLM",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
 
        mech_ntlm_auth_new,
        mech_generic_auth_initial,
index 8ef5decec1392c469dbd6bb64a5a3d13013cea33..b204de88aac931e7d878dc473eaebbd54bc2a35d 100644 (file)
@@ -252,8 +252,8 @@ static struct auth_request *mech_otp_auth_new(void)
 const struct mech_module mech_otp = {
        "OTP",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_SET_CREDENTIALS,
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_SET_CREDENTIALS,
 
        mech_otp_auth_new,
        mech_generic_auth_initial,
index 82cfe89116a9d1fec4bdb2de928b4bdc3a6108ea..65b6890ad5a67fb665d980b7e76d092d91887679 100644 (file)
@@ -78,8 +78,8 @@ static struct auth_request *mech_plain_auth_new(void)
 const struct mech_module mech_plain = {
        "PLAIN",
 
-       MEMBER(flags) MECH_SEC_PLAINTEXT,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_VERIFY_PLAIN,
+       .flags = MECH_SEC_PLAINTEXT,
+       .passdb_need = MECH_PASSDB_NEED_VERIFY_PLAIN,
 
        mech_plain_auth_new,
        mech_generic_auth_initial,
index 45ee8db3c84e0ba7c1357d324e9c61988ba03e18..0c0c194b50761e13956834b6a7e4ea70e93ba1ad 100644 (file)
@@ -581,9 +581,9 @@ static struct auth_request *mech_rpa_auth_new(void)
 const struct mech_module mech_rpa = {
        "RPA",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE |
                MECH_SEC_MUTUAL_AUTH,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
+       .passdb_need = MECH_PASSDB_NEED_LOOKUP_CREDENTIALS,
 
        mech_rpa_auth_new,
        mech_generic_auth_initial,
index f2bca22411ff33d43905f7320e7ca758dbaf5432..d6632e40bf7b03da602ac1badcb82bf33aa8428b 100644 (file)
@@ -189,8 +189,8 @@ static struct auth_request *mech_skey_auth_new(void)
 const struct mech_module mech_skey = {
        "SKEY",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_SET_CREDENTIALS,
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_SET_CREDENTIALS,
 
        mech_skey_auth_new,
        mech_generic_auth_initial,
index beb036976b886f5c25d5eff8f14a1acaa5954e46..daef851a15e11325d58a5b5eb5e56dd93dbaab4e 100644 (file)
@@ -330,8 +330,8 @@ static struct auth_request *mech_winbind_spnego_auth_new(void)
 const struct mech_module mech_winbind_ntlm = {
        "NTLM",
 
-       MEMBER(flags) MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_NOTHING,
+       .flags = MECH_SEC_DICTIONARY | MECH_SEC_ACTIVE,
+       .passdb_need = MECH_PASSDB_NEED_NOTHING,
 
        mech_winbind_ntlm_auth_new,
        mech_generic_auth_initial,
@@ -342,8 +342,8 @@ const struct mech_module mech_winbind_ntlm = {
 const struct mech_module mech_winbind_spnego = {
        "GSS-SPNEGO",
 
-       MEMBER(flags) 0,
-       MEMBER(passdb_need) MECH_PASSDB_NEED_NOTHING,
+       .flags = 0,
+       .passdb_need = MECH_PASSDB_NEED_NOTHING,
 
        mech_winbind_spnego_auth_new,
        mech_winbind_auth_initial,
index ea03c1b05a9c226a2a8568c9a3453d02dd66d1c5..ddd2fa3314194360d2e0950f3ed2188d8c5bc790 100644 (file)
@@ -83,6 +83,6 @@ struct passdb_module_interface passdb_bsdauth = {
 };
 #else
 struct passdb_module_interface passdb_bsdauth = {
-       MEMBER(name) "bsdauth"
+       .name = "bsdauth"
 };
 #endif
index 2dfa9642dde360deb774c1624da2cba003bbea72..cfc5192028a370879e7bb9b2a9e6edac1d6e0c34 100644 (file)
@@ -283,6 +283,6 @@ struct passdb_module_interface passdb_checkpassword = {
 };
 #else
 struct passdb_module_interface passdb_checkpassword = {
-       MEMBER(name) "checkpassword"
+       .name = "checkpassword"
 };
 #endif
index b73d81059aee09f06303bd2e772be1ce73455be8..e5c31ecb259a8dc0be52ea200de0f6d5e2534718 100644 (file)
@@ -454,6 +454,6 @@ struct passdb_module_interface passdb_ldap_plugin =
 };
 #else
 struct passdb_module_interface passdb_ldap = {
-       MEMBER(name) "ldap"
+       .name = "ldap"
 };
 #endif
index d1b050c48ddbb1a1d1c4bd00bbec87c9e3874ac6..17977a67b95a63808a2401419c6eb0b391ff7b85 100644 (file)
@@ -385,6 +385,6 @@ struct passdb_module_interface passdb_pam = {
 };
 #else
 struct passdb_module_interface passdb_pam = {
-       MEMBER(name) "pam"
+       .name = "pam"
 };
 #endif
index 0b5bdad3b5b502c7067daffa0299e6098da73e71..413f0344e8b0b8c5b6632066fe7e5a2d58a28075 100644 (file)
@@ -191,6 +191,6 @@ struct passdb_module_interface passdb_passwd_file = {
 };
 #else
 struct passdb_module_interface passdb_passwd_file = {
-       MEMBER(name) "passwd-file"
+       .name = "passwd-file"
 };
 #endif
index 3e37bf42b92928bf9f5f1ce600050833e3100488..8a8195404a6772726b7ca26766e746826518027c 100644 (file)
@@ -87,6 +87,6 @@ struct passdb_module_interface passdb_passwd = {
 
 #else
 struct passdb_module_interface passdb_passwd = {
-       MEMBER(name) "passwd"
+       .name = "passwd"
 };
 #endif
index d29acb7a54e93c5915f1aecd53195c45eed8d1be..1591020d9eef81d3da9d797839047284a25bae59 100644 (file)
@@ -86,6 +86,6 @@ struct passdb_module_interface passdb_shadow = {
 };
 #else
 struct passdb_module_interface passdb_shadow = {
-       MEMBER(name) "shadow"
+       .name = "shadow"
 };
 #endif
index 5d43420f3e895d1606efdd27c1a34a839755ce18..9aeb68a58ebd72809cebd8cdfa1772c624303560 100644 (file)
@@ -61,6 +61,6 @@ struct passdb_module_interface passdb_sia = {
 };
 #else
 struct passdb_module_interface passdb_sia = {
-       MEMBER(name) "sia"
+       .name = "sia"
 };
 #endif
index d0badbecc928edad8d972797216ef8248cfda9a7..71e96d7ab4e1530b7ea251a2ab49f197c646ef97 100644 (file)
@@ -275,6 +275,6 @@ struct passdb_module_interface passdb_sql = {
 };
 #else
 struct passdb_module_interface passdb_sql = {
-       MEMBER(name) "sql"
+       .name = "sql"
 };
 #endif
index 9e234bec0ecab7f3558d897bf1c3abe1e5c0b671..bb5aefc61e6588de0f4c881e1d62ea7c0c207877 100644 (file)
@@ -202,6 +202,6 @@ struct passdb_module_interface passdb_vpopmail = {
 };
 #else
 struct passdb_module_interface passdb_vpopmail = {
-       MEMBER(name) "vpopmail"
+       .name = "vpopmail"
 };
 #endif
index 15fff43b0daac496c43e7fe05d66bd16c99d16a1..64cdd7b25ee07dbbdcfca21bcb85a3e989762997 100644 (file)
@@ -268,6 +268,6 @@ struct userdb_module_interface userdb_checkpassword = {
 };
 #else
 struct userdb_module_interface userdb_checkpassword = {
-       MEMBER(name) "checkpassword"
+       .name = "checkpassword"
 };
 #endif
index d04dcb71e2c1dfd30a4a41c1aba542b02f9c45c3..5721b7fde9a510d4b4e9e17784c01bb9ca75123b 100644 (file)
@@ -297,6 +297,6 @@ struct userdb_module_interface userdb_ldap_plugin =
 };
 #else
 struct userdb_module_interface userdb_ldap = {
-       MEMBER(name) "ldap"
+       .name = "ldap"
 };
 #endif
index 6e06f45c15f0dcccd954ca38d4c45c94f0079278..ae0ff9f7b906a1f76afda25a1f1b73a83df2721a 100644 (file)
@@ -155,6 +155,6 @@ struct userdb_module_interface userdb_nss = {
 };
 #else
 struct userdb_module_interface userdb_nss = {
-       MEMBER(name) "nss"
+       .name = "nss"
 };
 #endif
index 5bae1f0f59fce0eff0fbd25f074a429033f2ee58..535f354ba435c10d995ae032327d22a35e109b20 100644 (file)
@@ -224,6 +224,6 @@ struct userdb_module_interface userdb_passwd_file = {
 };
 #else
 struct userdb_module_interface userdb_passwd_file = {
-       MEMBER(name) "passwd-file"
+       .name = "passwd-file"
 };
 #endif
index c2251374c2b57f80bcd9b59009d184d1100124f7..addfef608e0279755cc8f514d727fe7188dddcd9 100644 (file)
@@ -168,6 +168,6 @@ struct userdb_module_interface userdb_passwd = {
 };
 #else
 struct userdb_module_interface userdb_passwd = {
-       MEMBER(name) "passwd"
+       .name = "passwd"
 };
 #endif
index 4d70bea9884390703271aa13be16ff0e78095103..5607a65526a6ddef8a5a79739a4d716b81f70e55 100644 (file)
@@ -55,6 +55,6 @@ struct userdb_module_interface userdb_prefetch = {
 };
 #else
 struct userdb_module_interface userdb_prefetch = {
-       MEMBER(name) "prefetch"
+       .name = "prefetch"
 };
 #endif
index 96a2b6d96447d340742aaaec4881872527190920..6006e0a1b2a8c2b73fc883a9604004e8a3eb37ce 100644 (file)
@@ -276,6 +276,6 @@ struct userdb_module_interface userdb_sql = {
 };
 #else
 struct userdb_module_interface userdb_sql = {
-       MEMBER(name) "sql"
+       .name = "sql"
 };
 #endif
index 7baa104e498a0fba2467bcc0d6e876e3595e5da9..302aef73767ae7dc2479ed94b0d1d0075a5277de 100644 (file)
@@ -244,6 +244,6 @@ struct userdb_module_interface userdb_static = {
 };
 #else
 struct userdb_module_interface userdb_static = {
-       MEMBER(name) "static"
+       .name = "static"
 };
 #endif
index 1d79bd1d3d00426778a85bc64bd29b81b102b91f..60469caab236509de58309b854c8c3c36cfc81ab 100644 (file)
@@ -178,6 +178,6 @@ struct userdb_module_interface userdb_vpopmail = {
 };
 #else
 struct userdb_module_interface userdb_vpopmail = {
-       MEMBER(name) "vpopmail"
+       .name = "vpopmail"
 };
 #endif
index 342a435baf1207da7cd390091dfb3c7b1f7c8993..00859fd1e90e39ee1a7d19784a26eebc18f786e8 100644 (file)
@@ -20,26 +20,26 @@ static buffer_t config_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings config_service_settings = {
-       MEMBER(name) "config",
-       MEMBER(protocol) "",
-       MEMBER(type) "config",
-       MEMBER(executable) "config",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
+       .name = "config",
+       .protocol = "",
+       .type = "config",
+       .executable = "config",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
 
-       MEMBER(drop_priv_before_exec) FALSE,
+       .drop_priv_before_exec = FALSE,
 
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
 
-       MEMBER(unix_listeners) { { &config_unix_listeners_buf,
-                                  sizeof(config_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .unix_listeners = { { &config_unix_listeners_buf,
+                             sizeof(config_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
index bcf816a1d363c56a698f3df93dd024a9be3e3a89..55efb171c88f74af1148137cc7b4cef212a237f4 100644 (file)
@@ -19,28 +19,28 @@ static buffer_t dict_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings dict_service_settings = {
-       MEMBER(name) "dict",
-       MEMBER(protocol) "",
-       MEMBER(type) "",
-       MEMBER(executable) "dict",
-       MEMBER(user) "dovecot",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
+       .name = "dict",
+       .protocol = "",
+       .type = "",
+       .executable = "dict",
+       .user = "dovecot",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
 
-       MEMBER(drop_priv_before_exec) FALSE,
+       .drop_priv_before_exec = FALSE,
 
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
 
-       MEMBER(unix_listeners) { { &dict_unix_listeners_buf,
-                                  sizeof(dict_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .unix_listeners = { { &dict_unix_listeners_buf,
+                             sizeof(dict_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -56,20 +56,20 @@ static const struct setting_define dict_setting_defines[] = {
 };
 
 const struct dict_settings dict_default_settings = {
-       MEMBER(base_dir) PKG_RUNDIR,
-       MEMBER(dict_db_config) "",
-       MEMBER(dicts) ARRAY_INIT
+       .base_dir = PKG_RUNDIR,
+       .dict_db_config = "",
+       .dicts = ARRAY_INIT
 };
 
 const struct setting_parser_info dict_setting_parser_info = {
-       MEMBER(module_name) "dict",
-       MEMBER(defines) dict_setting_defines,
-       MEMBER(defaults) &dict_default_settings,
+       .module_name = "dict",
+       .defines = dict_setting_defines,
+       .defaults = &dict_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct dict_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct dict_settings),
 
-       MEMBER(parent_offset) (size_t)-1
+       .parent_offset = (size_t)-1
 };
 
 const struct dict_settings *dict_settings;
index b005fb8ff23d43d42476f003d77608f438e1a03f..e390493a43dbe645080b189e6ebc5521e827bef7 100644 (file)
@@ -9,27 +9,27 @@
 #include <stddef.h>
 
 struct service_settings imap_login_service_settings = {
-       MEMBER(name) "imap-login",
-       MEMBER(protocol) "imap",
-       MEMBER(type) "login",
-       MEMBER(executable) "imap-login",
-       MEMBER(user) "dovecot",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "login",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 1,
-       MEMBER(vsz_limit) 64,
-
-       MEMBER(unix_listeners) ARRAY_INIT,
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "imap-login",
+       .protocol = "imap",
+       .type = "login",
+       .executable = "imap-login",
+       .user = "dovecot",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "login",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 1,
+       .vsz_limit = 64,
+
+       .unix_listeners = ARRAY_INIT,
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -43,7 +43,7 @@ static const struct setting_define imap_login_setting_defines[] = {
 };
 
 static const struct imap_login_settings imap_login_default_settings = {
-       MEMBER(imap_capability) ""
+       .imap_capability = ""
 };
 
 static const struct setting_parser_info *imap_login_setting_dependencies[] = {
@@ -52,18 +52,15 @@ static const struct setting_parser_info *imap_login_setting_dependencies[] = {
 };
 
 static const struct setting_parser_info imap_login_setting_parser_info = {
-       MEMBER(module_name) "imap-login",
-       MEMBER(defines) imap_login_setting_defines,
-       MEMBER(defaults) &imap_login_default_settings,
-
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct imap_login_settings),
+       .module_name = "imap-login",
+       .defines = imap_login_setting_defines,
+       .defaults = &imap_login_default_settings,
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct imap_login_settings),
 
-       MEMBER(check_func) NULL,
-       MEMBER(dependencies) imap_login_setting_dependencies
+       .parent_offset = (size_t)-1,
+       .dependencies = imap_login_setting_dependencies
 };
 
 const struct setting_parser_info *imap_login_setting_roots[] = {
index de468b575ef59b419d0afa2ea2d69d3a64166ced..e68059fc819026f1416a963cdfd0ef935452ae68 100644 (file)
@@ -27,28 +27,28 @@ static buffer_t imap_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings imap_service_settings = {
-       MEMBER(name) "imap",
-       MEMBER(protocol) "imap",
-       MEMBER(type) "",
-       MEMBER(executable) "imap",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 1,
-       MEMBER(vsz_limit) -1U,
-
-       MEMBER(unix_listeners) { { &imap_unix_listeners_buf,
-                                  sizeof(imap_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "imap",
+       .protocol = "imap",
+       .type = "",
+       .executable = "imap",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 1,
+       .vsz_limit = -1U,
+
+       .unix_listeners = { { &imap_unix_listeners_buf,
+                             sizeof(imap_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -74,19 +74,19 @@ static const struct setting_define imap_setting_defines[] = {
 };
 
 static const struct imap_settings imap_default_settings = {
-       MEMBER(mail_debug) FALSE,
-       MEMBER(verbose_proctitle) FALSE,
+       .mail_debug = FALSE,
+       .verbose_proctitle = FALSE,
 
        /* RFC-2683 recommends at least 8000 bytes. Some clients however don't
           break large message sets to multiple commands, so we're pretty
           liberal by default. */
-       MEMBER(imap_max_line_length) 64*1024,
-       MEMBER(imap_idle_notify_interval) 2*60,
-       MEMBER(imap_capability) "",
-       MEMBER(imap_client_workarounds) "outlook-idle",
-       MEMBER(imap_logout_format) "bytes=%i/%o",
-       MEMBER(imap_id_send) "",
-       MEMBER(imap_id_log) ""
+       .imap_max_line_length = 64*1024,
+       .imap_idle_notify_interval = 2*60,
+       .imap_capability = "",
+       .imap_client_workarounds = "outlook-idle",
+       .imap_logout_format = "bytes=%i/%o",
+       .imap_id_send = "",
+       .imap_id_log = ""
 };
 
 static const struct setting_parser_info *imap_setting_dependencies[] = {
@@ -95,18 +95,17 @@ static const struct setting_parser_info *imap_setting_dependencies[] = {
 };
 
 const struct setting_parser_info imap_setting_parser_info = {
-       MEMBER(module_name) "imap",
-       MEMBER(defines) imap_setting_defines,
-       MEMBER(defaults) &imap_default_settings,
+       .module_name = "imap",
+       .defines = imap_setting_defines,
+       .defaults = &imap_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct imap_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct imap_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) imap_settings_verify,
-       MEMBER(dependencies) imap_setting_dependencies
+       .check_func = imap_settings_verify,
+       .dependencies = imap_setting_dependencies
 };
 
 /* <settings checks> */
index 76b943b89f82b90175e1abaf0aaf144b6907da1b..695fe8a3818558f45895a395f91feae403497c50 100644 (file)
@@ -691,7 +691,7 @@ static void client_dict_atomic_inc(struct dict_transaction_context *_ctx,
 }
 
 struct dict dict_driver_client = {
-       MEMBER(name) "proxy",
+       .name = "proxy",
 
        {
                client_dict_init,
index d601173d45ff5573ba64cb602fb7f4b9ccfc65e7..c150b0e9beb30d294f9deb1106d1d8e4c13cc27a 100644 (file)
@@ -449,7 +449,7 @@ db_dict_atomic_inc(struct dict_transaction_context *_ctx ATTR_UNUSED,
 }
 
 struct dict dict_driver_db = {
-       MEMBER(name) "db",
+       .name = "db",
        {
                db_dict_init,
                db_dict_deinit,
index 6c4e8bbb52397ab4f10f827f56cc486cd95ec859..10b94470d3c7e86869c284d7a970308580c58c5a 100644 (file)
@@ -59,11 +59,8 @@ struct file_dict_transaction_context {
 };
 
 static struct dotlock_settings file_dict_dotlock_settings = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 30,
-       MEMBER(stale_timeout) 5
+       .timeout = 30,
+       .stale_timeout = 5
 };
 
 static struct dict *file_dict_init(struct dict *driver, const char *uri,
@@ -440,7 +437,7 @@ file_dict_atomic_inc(struct dict_transaction_context *_ctx,
 }
 
 struct dict dict_driver_file = {
-       MEMBER(name) "file",
+       .name = "file",
        {
                file_dict_init,
                file_dict_deinit,
index adcd2f3900c0a2770e670a0c9001f6ae44b7a6d9..ede9afb02939e150078e0a83fe3b054dbc351574 100644 (file)
@@ -850,7 +850,7 @@ static void sql_dict_atomic_inc(struct dict_transaction_context *_ctx,
 }
 
 static struct dict sql_dict = {
-       MEMBER(name) "sql",
+       .name = "sql",
 
        {
                sql_dict_init,
index 60c893ccfc0d45c978e3c883f60279f6b3a89108..0c39eafb3b0592fa2575935bc3bddf2f4ede3410 100644 (file)
@@ -90,11 +90,8 @@ struct mail_index_strmap_hash_key {
 #define MAIL_INDEX_STRMAP_TIMEOUT_SECS 10
 
 const struct dotlock_settings default_dotlock_settings = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) MAIL_INDEX_STRMAP_TIMEOUT_SECS,
-       MEMBER(stale_timeout) 30
+       .timeout = MAIL_INDEX_STRMAP_TIMEOUT_SECS,
+       .stale_timeout = 30
 };
 
 struct mail_index_strmap *
index 465e051e1918c8d5962e84ace67b38587720214c..e8d76e7eba11a4575798453171e241bade6e895b 100644 (file)
@@ -42,11 +42,8 @@ struct mailbox_list_iter_ctx {
 };
 
 static const struct dotlock_settings default_dotlock_set = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 60,
-       MEMBER(stale_timeout) 30
+       .timeout = 60,
+       .stale_timeout = 30
 };
 
 int mailbox_list_index_set_syscall_error(struct mailbox_list_index *index,
index 0ab52f12cac1c01c9fc016a20bf2a1e9baec609d..24b1d85ca4b5053e38387c73c85a76c1078af1d8 100644 (file)
@@ -55,16 +55,8 @@ struct duplicate_context {
 };
 
 static const struct dotlock_settings default_duplicate_dotlock_set = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 20,
-       MEMBER(stale_timeout) 10,
-
-       MEMBER(callback) NULL,
-       MEMBER(context) NULL,
-
-       MEMBER(use_excl_lock) FALSE
+       .timeout = 20,
+       .stale_timeout = 10,
 };
 
 static int duplicate_cmp(const void *p1, const void *p2)
index e4f8d9ae434c07b963f7abc9b234f0ce38e81a46..2ba0d8e0cd65d53ddd6284b3771ee98b5b87b8f4 100644 (file)
@@ -33,17 +33,17 @@ static const struct setting_define lda_setting_defines[] = {
 };
 
 static const struct lda_settings lda_default_settings = {
-       MEMBER(postmaster_address) "",
-       MEMBER(hostname) "",
-       MEMBER(sendmail_path) "/usr/lib/sendmail",
-       MEMBER(rejection_subject) "Rejected: %s",
-       MEMBER(rejection_reason)
+       .postmaster_address = "",
+       .hostname = "",
+       .sendmail_path = "/usr/lib/sendmail",
+       .rejection_subject = "Rejected: %s",
+       .rejection_reason =
                "Your message to <%t> was automatically rejected:%n%r",
-       MEMBER(deliver_log_format) "msgid=%m: %$",
-       MEMBER(recipient_delimiter) "",
-       MEMBER(quota_full_tempfail) FALSE,
-       MEMBER(lda_mailbox_autocreate) FALSE,
-       MEMBER(lda_mailbox_autosubscribe) FALSE
+       .deliver_log_format = "msgid=%m: %$",
+       .recipient_delimiter = "",
+       .quota_full_tempfail = FALSE,
+       .lda_mailbox_autocreate = FALSE,
+       .lda_mailbox_autosubscribe = FALSE
 };
 
 static const struct setting_parser_info *lda_setting_dependencies[] = {
@@ -52,22 +52,19 @@ static const struct setting_parser_info *lda_setting_dependencies[] = {
 };
 
 const struct setting_parser_info lda_setting_parser_info = {
-       MEMBER(module_name) "lda",
-       MEMBER(defines) lda_setting_defines,
-       MEMBER(defaults) &lda_default_settings,
+       .module_name = "lda",
+       .defines = lda_setting_defines,
+       .defaults = &lda_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct lda_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct lda_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-#ifdef CONFIG_BINARY
-       MEMBER(check_func) NULL,
-#else
-       MEMBER(check_func) lda_settings_check,
+#ifndef CONFIG_BINARY
+       .check_func = lda_settings_check,
 #endif
-       MEMBER(dependencies) lda_setting_dependencies
+       .dependencies = lda_setting_dependencies
 };
 
 static bool lda_settings_check(void *_set, pool_t pool ATTR_UNUSED,
index bacf218f82d2b5e2f65d25cd24b64ed8b0341fa5..eac81e7ce59244e57a21e5972fb5d289b80aa049 100644 (file)
@@ -37,24 +37,24 @@ static const struct setting_define master_service_setting_defines[] = {
 };
 
 static const struct master_service_settings master_service_default_settings = {
-       MEMBER(log_path) "",
-       MEMBER(info_log_path) "",
-       MEMBER(debug_log_path) "",
-       MEMBER(log_timestamp) DEFAULT_FAILURE_STAMP_FORMAT,
-       MEMBER(syslog_facility) "mail",
-       MEMBER(version_ignore) FALSE,
-       MEMBER(shutdown_clients) TRUE
+       .log_path = "",
+       .info_log_path = "",
+       .debug_log_path = "",
+       .log_timestamp = DEFAULT_FAILURE_STAMP_FORMAT,
+       .syslog_facility = "mail",
+       .version_ignore = FALSE,
+       .shutdown_clients = TRUE
 };
 
 const struct setting_parser_info master_service_setting_parser_info = {
-       MEMBER(module_name) "master",
-       MEMBER(defines) master_service_setting_defines,
-       MEMBER(defaults) &master_service_default_settings,
+       .module_name = "master",
+       .defines = master_service_setting_defines,
+       .defaults = &master_service_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct master_service_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct master_service_settings),
 
-       MEMBER(parent_offset) (size_t)-1
+       .parent_offset = (size_t)-1
 };
 
 static void ATTR_NORETURN
index 7cab6eec53e07a625fd4aa161aa29dae99a16341..4a1f3d5b9bc83686c468939b8ebdcb2f27055c14 100644 (file)
@@ -54,14 +54,14 @@ struct setting_parser_context {
 };
 
 static const struct setting_parser_info strlist_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) NULL,
-       MEMBER(defaults) NULL,
+       .module_name = NULL,
+       .defines = NULL,
+       .defaults = NULL,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) 0,
+       .type_offset = (size_t)-1,
+       .struct_size = 0,
 
-       MEMBER(parent_offset) (size_t)-1
+       .parent_offset = (size_t)-1
 };
 
 static void
index 935bb4f099c2cdbd9b2fe75bd0f5871d57f72d69..060b748abc6f63a6a7b2144e85f5a39872a279e3 100644 (file)
@@ -675,7 +675,7 @@ driver_mysql_update(struct sql_transaction_context *_ctx, const char *query,
 struct sql_db driver_mysql_db = {
        "mysql",
 
-       MEMBER(v) {
+       .v = {
                driver_mysql_init_v,
                driver_mysql_deinit_v,
                driver_mysql_get_flags,
@@ -695,7 +695,7 @@ struct sql_db driver_mysql_db = {
 };
 
 struct sql_result driver_mysql_result = {
-       MEMBER(v) {
+       .v = {
                driver_mysql_result_free,
                driver_mysql_result_next_row,
                driver_mysql_result_get_fields_count,
@@ -716,7 +716,7 @@ driver_mysql_result_error_next_row(struct sql_result *result ATTR_UNUSED)
 }
 
 struct sql_result driver_mysql_error_result = {
-       MEMBER(v) {
+       .v = {
                driver_mysql_result_free,
                driver_mysql_result_error_next_row,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL,
index 8c9bcd6811788d0fae6426c903c570e8199162ce..89d4c7dc35383cd2ed50933bc1435e24e89d9f2e 100644 (file)
@@ -1066,7 +1066,7 @@ driver_pgsql_update(struct sql_transaction_context *_ctx, const char *query,
 struct sql_db driver_pgsql_db = {
        "pgsql",
 
-       MEMBER(v) {
+       .v = {
                driver_pgsql_init_v,
                driver_pgsql_deinit_v,
                driver_pgsql_get_flags,
@@ -1086,7 +1086,7 @@ struct sql_db driver_pgsql_db = {
 };
 
 struct sql_result driver_pgsql_result = {
-       MEMBER(v) {
+       .v = {
                driver_pgsql_result_free,
                driver_pgsql_result_next_row,
                driver_pgsql_result_get_fields_count,
index 6a08490efb02f1dee657f78fa90e9ef918dfb313..53c055f675e90a42562a057828b69a56c72faaeb 100644 (file)
@@ -389,7 +389,7 @@ driver_sqlite_update(struct sql_transaction_context *_ctx, const char *query,
 struct sql_db driver_sqlite_db = {
        "sqlite",
 
-       MEMBER(v) {
+       .v = {
                driver_sqlite_init_v,
                driver_sqlite_deinit_v,
                driver_sqlite_get_flags,
@@ -408,7 +408,7 @@ struct sql_db driver_sqlite_db = {
 };
 
 struct sql_result driver_sqlite_result = {
-       MEMBER(v) {
+       .v = {
                driver_sqlite_result_free,
                driver_sqlite_result_next_row,
                driver_sqlite_result_get_fields_count,
@@ -429,7 +429,7 @@ driver_sqlite_result_error_next_row(struct sql_result *result ATTR_UNUSED)
 }
 
 struct sql_result driver_sqlite_error_result = {
-       MEMBER(v) {
+       .v = {
                driver_sqlite_result_free,
                driver_sqlite_result_error_next_row,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL,
index 42465b9b342bcfa46ec28a2bc96e839720aa2516..34993c890fed7abe69c3b3b1d0377bd9d8dd83fb 100644 (file)
@@ -335,7 +335,7 @@ void sql_update_get_rows(struct sql_transaction_context *ctx, const char *query,
 }
 
 struct sql_result sql_not_connected_result = {
-       MEMBER(v) {
+       .v = {
                sql_result_not_connected_free,
                sql_result_not_connected_next_row,
                NULL, NULL, NULL, NULL, NULL, NULL, NULL,
index 64ff217195d75f6f356c4efadd40e2b3c26598f2..3065c997cd477a0223c1250c378617d04f645d8d 100644 (file)
@@ -332,10 +332,10 @@ static void cydir_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 }
 
 struct mail_storage cydir_storage = {
-       MEMBER(name) CYDIR_STORAGE_NAME,
-       MEMBER(class_flags) 0,
+       .name = CYDIR_STORAGE_NAME,
+       .class_flags = 0,
 
-       {
+       .v = {
                NULL,
                cydir_storage_alloc,
                NULL,
@@ -349,11 +349,7 @@ struct mail_storage cydir_storage = {
 };
 
 struct mailbox cydir_mailbox = {
-       MEMBER(name) NULL, 
-       MEMBER(storage) NULL, 
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index 5b63f0d9e1e9f6af554022cdd205323b7c466b73..5b9b96f85309f64e9f89ce644a2797532998ab55 100644 (file)
@@ -25,25 +25,25 @@ static const struct setting_define mdbox_setting_defines[] = {
 };
 
 static const struct mdbox_settings mdbox_default_settings = {
-       MEMBER(mdbox_rotate_size) 2*1024*1024,
-       MEMBER(mdbox_rotate_min_size) 16*1024,
-       MEMBER(mdbox_rotate_days) 0,
-       MEMBER(mdbox_max_open_files) 64,
-       MEMBER(mdbox_purge_min_percentage) 0
+       .mdbox_rotate_size = 2*1024*1024,
+       .mdbox_rotate_min_size = 16*1024,
+       .mdbox_rotate_days = 0,
+       .mdbox_max_open_files = 64,
+       .mdbox_purge_min_percentage = 0
 };
 
 static const struct setting_parser_info mdbox_setting_parser_info = {
-       MEMBER(module_name) "mdbox",
-       MEMBER(defines) mdbox_setting_defines,
-       MEMBER(defaults) &mdbox_default_settings,
+       .module_name = "mdbox",
+       .defines = mdbox_setting_defines,
+       .defaults = &mdbox_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct mdbox_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct mdbox_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &mail_user_setting_parser_info,
+       .parent_offset = (size_t)-1,
+       .parent = &mail_user_setting_parser_info,
 
-       MEMBER(check_func) mdbox_settings_verify
+       .check_func = mdbox_settings_verify
 };
 
 /* <settings checks> */
index 6c9f62e0541d8c71037899d89f72eb66c7884810..be46bbff713da9d7a56cdc82ecaf663216d9a130 100644 (file)
@@ -429,10 +429,10 @@ static void dbox_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 }
 
 struct mail_storage mdbox_storage = {
-       MEMBER(name) MDBOX_STORAGE_NAME,
-       MEMBER(class_flags) MAIL_STORAGE_CLASS_FLAG_UNIQUE_ROOT,
+       .name = MDBOX_STORAGE_NAME,
+       .class_flags = MAIL_STORAGE_CLASS_FLAG_UNIQUE_ROOT,
 
-       {
+       .v = {
                 mdbox_get_setting_parser_info,
                mdbox_storage_alloc,
                mdbox_storage_create,
@@ -446,11 +446,7 @@ struct mail_storage mdbox_storage = {
 };
 
 struct mailbox mdbox_mailbox = {
-       MEMBER(name) NULL,
-       MEMBER(storage) NULL,
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index 470f661ea68efe28de8e2f97f2ef171df65b8408..0c93129d96b594abc3fe258562b6bcbbbbb048cd 100644 (file)
@@ -301,10 +301,10 @@ static void sdbox_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 }
 
 struct mail_storage dbox_storage = {
-       MEMBER(name) SDBOX_STORAGE_NAME,
-       MEMBER(class_flags) 0,
+       .name = SDBOX_STORAGE_NAME,
+       .class_flags = 0,
 
-       {
+       .v = {
                 NULL,
                sdbox_storage_alloc,
                NULL,
@@ -318,11 +318,7 @@ struct mail_storage dbox_storage = {
 };
 
 struct mailbox sdbox_mailbox = {
-       MEMBER(name) NULL,
-       MEMBER(storage) NULL,
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index 9134669ce45945ad22691e45851ae3fe7f4a0c63..253adef7b4fd00e61a6e1a297edcf52a499920c6 100644 (file)
@@ -21,22 +21,22 @@ static const struct setting_define maildir_setting_defines[] = {
 };
 
 static const struct maildir_settings maildir_default_settings = {
-       MEMBER(maildir_stat_dirs) FALSE,
-       MEMBER(maildir_copy_with_hardlinks) TRUE,
-       MEMBER(maildir_copy_preserve_filename) FALSE,
-       MEMBER(maildir_very_dirty_syncs) FALSE
+       .maildir_stat_dirs = FALSE,
+       .maildir_copy_with_hardlinks = TRUE,
+       .maildir_copy_preserve_filename = FALSE,
+       .maildir_very_dirty_syncs = FALSE
 };
 
 static const struct setting_parser_info maildir_setting_parser_info = {
-       MEMBER(module_name) "maildir",
-       MEMBER(defines) maildir_setting_defines,
-       MEMBER(defaults) &maildir_default_settings,
+       .module_name = "maildir",
+       .defines = maildir_setting_defines,
+       .defaults = &maildir_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct maildir_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct maildir_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &mail_user_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &mail_user_setting_parser_info
 };
 
 const struct setting_parser_info *maildir_get_setting_parser_info(void)
index c05dbd59d7550d7f70dc071b17ce56b93df245d1..06c41046e77dfb757331520c2c6e1f13bf33580e 100644 (file)
@@ -1111,10 +1111,10 @@ static void maildir_storage_add_list(struct mail_storage *storage,
 }
 
 struct mail_storage maildir_storage = {
-       MEMBER(name) MAILDIR_STORAGE_NAME,
-       MEMBER(class_flags) 0,
+       .name = MAILDIR_STORAGE_NAME,
+       .class_flags = 0,
 
-       {
+       .v = {
                 maildir_get_setting_parser_info,
                maildir_storage_alloc,
                maildir_storage_create,
@@ -1128,11 +1128,7 @@ struct mail_storage maildir_storage = {
 };
 
 struct mailbox maildir_mailbox = {
-       MEMBER(name) NULL, 
-       MEMBER(storage) NULL, 
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index df1d4dea0207fb019b631a4f7746c06db1747eed..e23ddf844d03f31335cca6bb23988f2051cc4c18 100644 (file)
@@ -25,26 +25,26 @@ static const struct setting_define mbox_setting_defines[] = {
 };
 
 static const struct mbox_settings mbox_default_settings = {
-       MEMBER(mbox_read_locks) "fcntl",
-       MEMBER(mbox_write_locks) "dotlock fcntl",
-       MEMBER(mbox_lock_timeout) 5*60,
-       MEMBER(mbox_dotlock_change_timeout) 2*60,
-       MEMBER(mbox_min_index_size) 0,
-       MEMBER(mbox_dirty_syncs) TRUE,
-       MEMBER(mbox_very_dirty_syncs) FALSE,
-       MEMBER(mbox_lazy_writes) TRUE
+       .mbox_read_locks = "fcntl",
+       .mbox_write_locks = "dotlock fcntl",
+       .mbox_lock_timeout = 5*60,
+       .mbox_dotlock_change_timeout = 2*60,
+       .mbox_min_index_size = 0,
+       .mbox_dirty_syncs = TRUE,
+       .mbox_very_dirty_syncs = FALSE,
+       .mbox_lazy_writes = TRUE
 };
 
 static const struct setting_parser_info mbox_setting_parser_info = {
-       MEMBER(module_name) "mbox",
-       MEMBER(defines) mbox_setting_defines,
-       MEMBER(defaults) &mbox_default_settings,
+       .module_name = "mbox",
+       .defines = mbox_setting_defines,
+       .defaults = &mbox_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct mbox_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct mbox_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &mail_user_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &mail_user_setting_parser_info
 };
 
 const struct setting_parser_info *mbox_get_setting_parser_info(void)
index 15ebffa83397fcfbdb77c78bed52629b40699bf6..ef6ba48a5bdaf1ab7a101ec2dceeac50e461689f 100644 (file)
@@ -913,10 +913,10 @@ mbox_transaction_rollback(struct mailbox_transaction_context *t)
 }
 
 struct mail_storage mbox_storage = {
-       MEMBER(name) MBOX_STORAGE_NAME,
-       MEMBER(class_flags) MAIL_STORAGE_CLASS_FLAG_MAILBOX_IS_FILE,
+       .name = MBOX_STORAGE_NAME,
+       .class_flags = MAIL_STORAGE_CLASS_FLAG_MAILBOX_IS_FILE,
 
-       {
+       .v = {
                 mbox_get_setting_parser_info,
                mbox_storage_alloc,
                mbox_storage_create,
@@ -930,11 +930,7 @@ struct mail_storage mbox_storage = {
 };
 
 struct mailbox mbox_mailbox = {
-       MEMBER(name) NULL, 
-       MEMBER(storage) NULL, 
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index 1db23731096762dfc24faf898d9386fec4b12769..43b2e5c83043d13aea772f82f89511bb1cb035c9 100644 (file)
@@ -171,10 +171,10 @@ static void raw_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 }
 
 struct mail_storage raw_storage = {
-       MEMBER(name) RAW_STORAGE_NAME,
-       MEMBER(class_flags) MAIL_STORAGE_CLASS_FLAG_MAILBOX_IS_FILE,
+       .name = RAW_STORAGE_NAME,
+       .class_flags = MAIL_STORAGE_CLASS_FLAG_MAILBOX_IS_FILE,
 
-       {
+       .v = {
                NULL,
                raw_storage_alloc,
                NULL,
@@ -188,11 +188,7 @@ struct mail_storage raw_storage = {
 };
 
 struct mailbox raw_mailbox = {
-       MEMBER(name) NULL, 
-       MEMBER(storage) NULL, 
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index 46d1839b2136e5f367a7aed54218843f770a2199..bdb890d1f18d98ecc131e1e0626ff4d2642c6a33 100644 (file)
@@ -302,10 +302,10 @@ shared_list_rename_mailbox_pre(struct mailbox_list *oldlist,
 }
 
 struct mailbox_list shared_mailbox_list = {
-       MEMBER(name) "shared",
-       MEMBER(hierarchy_sep) '/',
-       MEMBER(props) 0,
-       MEMBER(mailbox_name_max_length) PATH_MAX,
+       .name = "shared",
+       .hierarchy_sep = '/',
+       .props = 0,
+       .mailbox_name_max_length = PATH_MAX,
 
        {
                shared_list_alloc,
index 11d9f2e24c9ed7567754430d90cb40f518d1c874..44a03954a01f77be0f1bbf926405d859d5efeb15 100644 (file)
@@ -289,10 +289,10 @@ int shared_storage_get_namespace(struct mail_namespace **_ns,
 }
 
 struct mail_storage shared_storage = {
-       MEMBER(name) SHARED_STORAGE_NAME,
-       MEMBER(class_flags) 0, /* unknown at this point */
+       .name = SHARED_STORAGE_NAME,
+       .class_flags = 0, /* unknown at this point */
 
-       {
+       .v = {
                NULL,
                shared_storage_alloc,
                shared_storage_create,
index 9bc15a8d9f3a8b60fa76d29029dcb7b11a3b5bb9..26bcd073bbc996254f68e811836420d08b370dcf 100644 (file)
@@ -414,10 +414,10 @@ static int fs_list_rename_mailbox(struct mailbox_list *oldlist,
 }
 
 struct mailbox_list fs_mailbox_list = {
-       MEMBER(name) MAILBOX_LIST_NAME_FS,
-       MEMBER(hierarchy_sep) '/',
-       MEMBER(props) 0,
-       MEMBER(mailbox_name_max_length) PATH_MAX,
+       .name = MAILBOX_LIST_NAME_FS,
+       .hierarchy_sep = '/',
+       .props = 0,
+       .mailbox_name_max_length = PATH_MAX,
 
        {
                fs_list_alloc,
index fa5894f3816aa0cbb354b30ed1adee6f89966966..b8ffd61b77bc3210dbcbfad819d8e2e0aec6a401 100644 (file)
@@ -439,10 +439,10 @@ maildir_list_rename_mailbox(struct mailbox_list *oldlist, const char *oldname,
 }
 
 struct mailbox_list maildir_mailbox_list = {
-       MEMBER(name) MAILBOX_LIST_NAME_MAILDIRPLUSPLUS,
-       MEMBER(hierarchy_sep) '.',
-       MEMBER(props) MAILBOX_LIST_PROP_NO_MAILDIR_NAME,
-       MEMBER(mailbox_name_max_length) PATH_MAX,
+       .name = MAILBOX_LIST_NAME_MAILDIRPLUSPLUS,
+       .hierarchy_sep = '.',
+       .props = MAILBOX_LIST_PROP_NO_MAILDIR_NAME,
+       .mailbox_name_max_length = PATH_MAX,
 
        {
                maildir_list_alloc,
@@ -468,10 +468,10 @@ struct mailbox_list maildir_mailbox_list = {
 };
 
 struct mailbox_list imapdir_mailbox_list = {
-       MEMBER(name) MAILBOX_LIST_NAME_IMAPDIR,
-       MEMBER(hierarchy_sep) '.',
-       MEMBER(props) MAILBOX_LIST_PROP_NO_MAILDIR_NAME,
-       MEMBER(mailbox_name_max_length) PATH_MAX,
+       .name = MAILBOX_LIST_NAME_IMAPDIR,
+       .hierarchy_sep = '.',
+       .props = MAILBOX_LIST_PROP_NO_MAILDIR_NAME,
+       .mailbox_name_max_length = PATH_MAX,
 
        {
                imapdir_list_alloc,
index df661a3a439629a340dea42e3b120caaecabfbee..043685a0a95dfef9f8262952a1bc9c5f1a0c8644 100644 (file)
@@ -43,37 +43,37 @@ static const struct setting_define mail_storage_setting_defines[] = {
 };
 
 const struct mail_storage_settings mail_storage_default_settings = {
-       MEMBER(mail_location) "",
-       MEMBER(mail_cache_fields) "flags",
-       MEMBER(mail_never_cache_fields) "imap.envelope",
-       MEMBER(mail_cache_min_mail_count) 0,
-       MEMBER(mailbox_idle_check_interval) 30,
-       MEMBER(mail_max_keyword_length) 50,
-       MEMBER(mail_save_crlf) FALSE,
-       MEMBER(fsync_disable) FALSE,
-       MEMBER(mmap_disable) FALSE,
-       MEMBER(dotlock_use_excl) FALSE,
-       MEMBER(mail_nfs_storage) FALSE,
-       MEMBER(mail_nfs_index) FALSE,
-       MEMBER(mailbox_list_index_disable) FALSE,
-       MEMBER(mail_debug) FALSE,
-       MEMBER(mail_full_filesystem_access) FALSE,
-       MEMBER(lock_method) "fcntl:flock:dotlock",
-       MEMBER(pop3_uidl_format) "%08Xu%08Xv"
+       .mail_location = "",
+       .mail_cache_fields = "flags",
+       .mail_never_cache_fields = "imap.envelope",
+       .mail_cache_min_mail_count = 0,
+       .mailbox_idle_check_interval = 30,
+       .mail_max_keyword_length = 50,
+       .mail_save_crlf = FALSE,
+       .fsync_disable = FALSE,
+       .mmap_disable = FALSE,
+       .dotlock_use_excl = FALSE,
+       .mail_nfs_storage = FALSE,
+       .mail_nfs_index = FALSE,
+       .mailbox_list_index_disable = FALSE,
+       .mail_debug = FALSE,
+       .mail_full_filesystem_access = FALSE,
+       .lock_method = "fcntl:flock:dotlock",
+       .pop3_uidl_format = "%08Xu%08Xv"
 };
 
 const struct setting_parser_info mail_storage_setting_parser_info = {
-       MEMBER(module_name) "mail",
-       MEMBER(defines) mail_storage_setting_defines,
-       MEMBER(defaults) &mail_storage_default_settings,
+       .module_name = "mail",
+       .defines = mail_storage_setting_defines,
+       .defaults = &mail_storage_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct mail_storage_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct mail_storage_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &mail_user_setting_parser_info,
+       .parent_offset = (size_t)-1,
+       .parent = &mail_user_setting_parser_info,
 
-       MEMBER(check_func) mail_storage_settings_check
+       .check_func = mail_storage_settings_check
 };
 
 #undef DEF
@@ -96,30 +96,29 @@ static const struct setting_define mail_namespace_setting_defines[] = {
 };
 
 const struct mail_namespace_settings mail_namespace_default_settings = {
-       MEMBER(type) "private:shared:public",
-       MEMBER(separator) "",
-       MEMBER(prefix) "",
-       MEMBER(location) "",
-       MEMBER(alias_for) NULL,
-
-       MEMBER(inbox) FALSE,
-       MEMBER(hidden) FALSE,
-       MEMBER(list) "yes:no:children",
-       MEMBER(subscriptions) TRUE
+       .type = "private:shared:public",
+       .separator = "",
+       .prefix = "",
+       .location = "",
+       .alias_for = NULL,
+
+       .inbox = FALSE,
+       .hidden = FALSE,
+       .list = "yes:no:children",
+       .subscriptions = TRUE
 };
 
 const struct setting_parser_info mail_namespace_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) mail_namespace_setting_defines,
-       MEMBER(defaults) &mail_namespace_default_settings,
+       .defines = mail_namespace_setting_defines,
+       .defaults = &mail_namespace_default_settings,
 
-       MEMBER(type_offset) offsetof(struct mail_namespace_settings, prefix),
-       MEMBER(struct_size) sizeof(struct mail_namespace_settings),
+       .type_offset = offsetof(struct mail_namespace_settings, prefix),
+       .struct_size = sizeof(struct mail_namespace_settings),
 
-       MEMBER(parent_offset) offsetof(struct mail_namespace_settings, user_set),
-       MEMBER(parent) &mail_user_setting_parser_info,
+       .parent_offset = offsetof(struct mail_namespace_settings, user_set),
+       .parent = &mail_user_setting_parser_info,
 
-       MEMBER(check_func) namespace_settings_check
+       .check_func = namespace_settings_check
 };
 
 #undef DEF
@@ -159,43 +158,42 @@ static const struct setting_define mail_user_setting_defines[] = {
 };
 
 static const struct mail_user_settings mail_user_default_settings = {
-       MEMBER(base_dir) PKG_RUNDIR,
-       MEMBER(auth_socket_path) "auth-userdb",
+       .base_dir = PKG_RUNDIR,
+       .auth_socket_path = "auth-userdb",
 
-       MEMBER(mail_uid) "",
-       MEMBER(mail_gid) "",
-       MEMBER(mail_home) "",
-       MEMBER(mail_chroot) "",
-       MEMBER(mail_access_groups) "",
-       MEMBER(mail_privileged_group) "",
-       MEMBER(valid_chroot_dirs) "",
+       .mail_uid = "",
+       .mail_gid = "",
+       .mail_home = "",
+       .mail_chroot = "",
+       .mail_access_groups = "",
+       .mail_privileged_group = "",
+       .valid_chroot_dirs = "",
 
-       MEMBER(first_valid_uid) 500,
-       MEMBER(last_valid_uid) 0,
-       MEMBER(first_valid_gid) 1,
-       MEMBER(last_valid_gid) 0,
+       .first_valid_uid = 500,
+       .last_valid_uid = 0,
+       .first_valid_gid = 1,
+       .last_valid_gid = 0,
 
-       MEMBER(mail_plugins) "",
-       MEMBER(mail_plugin_dir) MODULEDIR,
+       .mail_plugins = "",
+       .mail_plugin_dir = MODULEDIR,
 
-       MEMBER(mail_log_prefix) "%s(%u): ",
+       .mail_log_prefix = "%s(%u): ",
 
-       MEMBER(namespaces) ARRAY_INIT,
-       MEMBER(plugin_envs) ARRAY_INIT
+       .namespaces = ARRAY_INIT,
+       .plugin_envs = ARRAY_INIT
 };
 
 const struct setting_parser_info mail_user_setting_parser_info = {
-       MEMBER(module_name) "mail",
-       MEMBER(defines) mail_user_setting_defines,
-       MEMBER(defaults) &mail_user_default_settings,
+       .module_name = "mail",
+       .defines = mail_user_setting_defines,
+       .defaults = &mail_user_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct mail_user_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct mail_user_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) mail_user_settings_check
+       .check_func = mail_user_settings_check
 };
 
 const void *
index 92a5a3b24d2beb8a36a0fdcd4b55ed349dea0651..0bf4a2a05f41bd9edc465ef9c609434afc132c54 100644 (file)
@@ -31,10 +31,10 @@ test_storage_get_list_settings(const struct mail_namespace *ns ATTR_UNUSED,
 }
 
 struct mail_storage test_storage = {
-       MEMBER(name) "test",
-       MEMBER(class_flags) 0,
+       .name = "test",
+       .class_flags = 0,
 
-       {
+       .v = {
                NULL,
                test_storage_alloc,
                NULL,
index b367cb63d1b8068fae146ac53c6210acc5fb24a3..feef2157d22757b86931677c292dcbf070e08117 100644 (file)
@@ -300,11 +300,7 @@ static bool test_mailbox_is_inconsistent(struct mailbox *box ATTR_UNUSED)
 }
 
 struct mailbox test_mailbox = {
-       MEMBER(name) NULL,
-       MEMBER(storage) NULL,
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                test_mailbox_is_readonly,
                test_mailbox_allow_new_keywords,
                test_mailbox_enable,
index 3221a6f491e39afca11934d9beed346d489b9b53..4ddb0b908d199cb43421a1923ad182bf177dff68 100644 (file)
 #  define ATTR_COLD
 #endif
 
-/* C99-style struct member definitions */
-#if (defined(__STDC__) && __STDC_VERSION__ >= 199901L && \
-       !defined(_HPUX_SOURCE)) || __GNUC__ > 2
-#  define MEMBER(name) .name =
-#else
-#  define MEMBER(name)
-#endif
-
 /* Macros to provide type safety for callback functions' context parameters */
 #ifdef __GNUC__
 #  define CONTEXT_TYPE_SAFETY
index 99fbde24a50f13d748d9e1ea6f69ca1831b64565..49bc8fdf0adb436575f558379b51fe9809a2977d 100644 (file)
@@ -80,10 +80,10 @@ static const struct pool_vfuncs static_alloconly_pool_vfuncs = {
 };
 
 static const struct pool static_alloconly_pool = {
-       MEMBER(v) &static_alloconly_pool_vfuncs,
+       .v = &static_alloconly_pool_vfuncs,
 
-       MEMBER(alloconly_pool) TRUE,
-       MEMBER(datastack_pool) FALSE
+       .alloconly_pool = TRUE,
+       .datastack_pool = FALSE
 };
 
 #ifdef DEBUG
index c7a1c29e905559162ae6614ac909d7e9aafbedc5..faefe523d1b7ac90b600efc56a66defcec26af04 100644 (file)
@@ -31,10 +31,10 @@ static struct pool_vfuncs static_data_stack_pool_vfuncs = {
 };
 
 static const struct pool static_data_stack_pool = {
-       MEMBER(v) &static_data_stack_pool_vfuncs,
+       .v = &static_data_stack_pool_vfuncs,
 
-       MEMBER(alloconly_pool) TRUE,
-       MEMBER(datastack_pool) TRUE
+       .alloconly_pool = TRUE,
+       .datastack_pool = TRUE
 };
 
 struct datastack_pool {
index 666860cd9f03df9102ff4de5e79973e985efba78..32dc2552126ed5aa55cccb1ec1b72069f693b201 100644 (file)
@@ -58,10 +58,10 @@ static struct pool_vfuncs static_system_clean_pool_vfuncs = {
 };
 
 static struct pool static_system_clean_pool = {
-       MEMBER(v) &static_system_clean_pool_vfuncs,
+       .v = &static_system_clean_pool_vfuncs,
 
-       MEMBER(alloconly_pool) FALSE,
-       MEMBER(datastack_pool) FALSE
+       .alloconly_pool = FALSE,
+       .datastack_pool = FALSE
 };
 
 pool_t system_clean_pool = &static_system_clean_pool;
index c802355fdfe5bf87bb80d463653143c152a2fbc1..ba6a29ad12828d3161d3b89a83263011a0f3d2b3 100644 (file)
@@ -46,10 +46,10 @@ static struct pool_vfuncs static_system_pool_vfuncs = {
 };
 
 struct pool static_system_pool = {
-       MEMBER(v) &static_system_pool_vfuncs,
+       .v = &static_system_pool_vfuncs,
 
-       MEMBER(alloconly_pool) FALSE,
-       MEMBER(datastack_pool) FALSE
+       .alloconly_pool = FALSE,
+       .datastack_pool = FALSE
 };
 
 pool_t system_pool = &static_system_pool;
index 976faa31d133782aadec99283d1248fe81d9e575..a1b2576503464a261d53f7439612f53e9066b9a6 100644 (file)
@@ -31,10 +31,10 @@ static struct pool_vfuncs static_unsafe_data_stack_pool_vfuncs = {
 };
 
 static struct pool static_unsafe_data_stack_pool = {
-       MEMBER(v) &static_unsafe_data_stack_pool_vfuncs,
+       .v = &static_unsafe_data_stack_pool_vfuncs,
 
-       MEMBER(alloconly_pool) TRUE,
-       MEMBER(datastack_pool) TRUE
+       .alloconly_pool = TRUE,
+       .datastack_pool = TRUE
 };
 
 pool_t unsafe_data_stack_pool = &static_unsafe_data_stack_pool;
index d44f25a7182cf0e3c924a5df866878103c6a3b8f..f7bdf99845ecebdfa10df22530fbc1f3ddcdbf4c 100644 (file)
@@ -25,28 +25,28 @@ static buffer_t lmtp_login_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings lmtp_login_service_settings = {
-       MEMBER(name) "lmtp",
-       MEMBER(protocol) "lmtp",
-       MEMBER(type) "",
-       MEMBER(executable) "lmtp",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) 0,
-
-       MEMBER(unix_listeners) { { &lmtp_login_unix_listeners_buf,
-                                  sizeof(lmtp_login_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "lmtp",
+       .protocol = "lmtp",
+       .type = "",
+       .executable = "lmtp",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = 0,
+
+       .unix_listeners = { { &lmtp_login_unix_listeners_buf,
+                             sizeof(lmtp_login_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -60,7 +60,7 @@ static const struct setting_define lmtp_setting_defines[] = {
 };
 
 static const struct lmtp_settings lmtp_default_settings = {
-       MEMBER(lmtp_proxy) FALSE
+       .lmtp_proxy = FALSE
 };
 
 static const struct setting_parser_info *lmtp_setting_dependencies[] = {
@@ -69,18 +69,16 @@ static const struct setting_parser_info *lmtp_setting_dependencies[] = {
 };
 
 const struct setting_parser_info lmtp_setting_parser_info = {
-       MEMBER(module_name) "lmtp",
-       MEMBER(defines) lmtp_setting_defines,
-       MEMBER(defaults) &lmtp_default_settings,
+       .module_name = "lmtp",
+       .defines = lmtp_setting_defines,
+       .defaults = &lmtp_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct lmtp_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct lmtp_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) NULL,
-       MEMBER(dependencies) lmtp_setting_dependencies
+       .dependencies = lmtp_setting_dependencies
 };
 
 void lmtp_settings_dup(pool_t pool, const struct lmtp_settings **lmtp_set_r,
index 1e0aa9a3274df47df033148e70102615793a12f0..e4008079f4038f35fcccb0841a2cdc1bcdb24870 100644 (file)
@@ -7,26 +7,26 @@
 #include <stddef.h>
 
 struct service_settings log_service_settings = {
-       MEMBER(name) "log",
-       MEMBER(protocol) "",
-       MEMBER(type) "log",
-       MEMBER(executable) "log",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
+       .name = "log",
+       .protocol = "",
+       .type = "log",
+       .executable = "log",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
 
-       MEMBER(drop_priv_before_exec) FALSE,
+       .drop_priv_before_exec = FALSE,
 
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 1,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
+       .process_min_avail = 0,
+       .process_limit = 1,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
 
-       MEMBER(unix_listeners) ARRAY_INIT,
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .unix_listeners = ARRAY_INIT,
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
index 42c38840c782a88dac9334139939b720ed65e288..25c0bf2b3394bdfad0380563319e38a4dd94d766 100644 (file)
@@ -46,44 +46,43 @@ static const struct setting_define login_setting_defines[] = {
 };
 
 static const struct login_settings login_default_settings = {
-       MEMBER(login_trusted_networks) "",
-       MEMBER(login_greeting) PACKAGE_NAME" ready.",
-       MEMBER(login_log_format_elements) "user=<%u> method=%m rip=%r lip=%l %c",
-       MEMBER(login_log_format) "%$: %s",
-
-       MEMBER(ssl) "yes:no:required",
-       MEMBER(ssl_ca_file) "",
-       MEMBER(ssl_cert) "",
-       MEMBER(ssl_key) "",
-       MEMBER(ssl_key_password) "",
-       MEMBER(ssl_parameters_file) "ssl-parameters.dat",
-       MEMBER(ssl_cipher_list) "ALL:!LOW:!SSLv2:!EXP:!aNULL",
-       MEMBER(ssl_cert_username_field) "commonName",
-       MEMBER(ssl_verify_client_cert) FALSE,
-       MEMBER(ssl_require_client_cert) FALSE,
-       MEMBER(ssl_username_from_cert) FALSE,
-       MEMBER(verbose_ssl) FALSE,
-
-       MEMBER(disable_plaintext_auth) TRUE,
-       MEMBER(verbose_auth) FALSE,
-       MEMBER(auth_debug) FALSE,
-       MEMBER(verbose_proctitle) FALSE,
-
-       MEMBER(mail_max_userip_connections) 10
+       .login_trusted_networks = "",
+       .login_greeting = PACKAGE_NAME" ready.",
+       .login_log_format_elements = "user=<%u> method=%m rip=%r lip=%l %c",
+       .login_log_format = "%$: %s",
+
+       .ssl = "yes:no:required",
+       .ssl_ca_file = "",
+       .ssl_cert = "",
+       .ssl_key = "",
+       .ssl_key_password = "",
+       .ssl_parameters_file = "ssl-parameters.dat",
+       .ssl_cipher_list = "ALL:!LOW:!SSLv2:!EXP:!aNULL",
+       .ssl_cert_username_field = "commonName",
+       .ssl_verify_client_cert = FALSE,
+       .ssl_require_client_cert = FALSE,
+       .ssl_username_from_cert = FALSE,
+       .verbose_ssl = FALSE,
+
+       .disable_plaintext_auth = TRUE,
+       .verbose_auth = FALSE,
+       .auth_debug = FALSE,
+       .verbose_proctitle = FALSE,
+
+       .mail_max_userip_connections = 10
 };
 
 const struct setting_parser_info login_setting_parser_info = {
-       MEMBER(module_name) "login",
-       MEMBER(defines) login_setting_defines,
-       MEMBER(defaults) &login_default_settings,
+       .module_name = "login",
+       .defines = login_setting_defines,
+       .defaults = &login_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct login_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct login_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) login_settings_check
+       .check_func = login_settings_check
 };
 
 static const struct setting_parser_info *default_login_set_roots[] = {
index 21b760d986bee1833bd93caa639acc2a3ff9e92f..299a1d8e27bab2893c182a47c4e2034d27df9ed5 100644 (file)
@@ -36,22 +36,21 @@ static const struct setting_define file_listener_setting_defines[] = {
 };
 
 static const struct file_listener_settings file_listener_default_settings = {
-       MEMBER(path) "",
-       MEMBER(mode) 0600,
-       MEMBER(user) "",
-       MEMBER(group) "",
+       .path = "",
+       .mode = 0600,
+       .user = "",
+       .group = "",
 };
 
 static const struct setting_parser_info file_listener_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) file_listener_setting_defines,
-       MEMBER(defaults) &file_listener_default_settings,
+       .defines = file_listener_setting_defines,
+       .defaults = &file_listener_default_settings,
 
-       MEMBER(type_offset) offsetof(struct file_listener_settings, path),
-       MEMBER(struct_size) sizeof(struct file_listener_settings),
+       .type_offset = offsetof(struct file_listener_settings, path),
+       .struct_size = sizeof(struct file_listener_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &service_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &service_setting_parser_info
 };
 
 #undef DEF
@@ -67,21 +66,20 @@ static const struct setting_define inet_listener_setting_defines[] = {
 };
 
 static const struct inet_listener_settings inet_listener_default_settings = {
-       MEMBER(address) "",
-       MEMBER(port) 0,
-       MEMBER(ssl) FALSE
+       .address = "",
+       .port = 0,
+       .ssl = FALSE
 };
 
 static const struct setting_parser_info inet_listener_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) inet_listener_setting_defines,
-       MEMBER(defaults) &inet_listener_default_settings,
+       .defines = inet_listener_setting_defines,
+       .defaults = &inet_listener_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct inet_listener_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct inet_listener_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) &service_setting_parser_info
+       .parent_offset = (size_t)-1,
+       .parent = &service_setting_parser_info
 };
 
 #undef DEF
@@ -124,39 +122,38 @@ static const struct setting_define service_setting_defines[] = {
 };
 
 static const struct service_settings service_default_settings = {
-       MEMBER(name) "",
-       MEMBER(protocol) "",
-       MEMBER(type) "",
-       MEMBER(executable) "",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) -1U,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) (uoff_t)-1,
-
-       MEMBER(unix_listeners) ARRAY_INIT,
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "",
+       .protocol = "",
+       .type = "",
+       .executable = "",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = -1U,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = (uoff_t)-1,
+
+       .unix_listeners = ARRAY_INIT,
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 const struct setting_parser_info service_setting_parser_info = {
-       MEMBER(module_name) NULL,
-       MEMBER(defines) service_setting_defines,
-       MEMBER(defaults) &service_default_settings,
+       .defines = service_setting_defines,
+       .defaults = &service_default_settings,
 
-       MEMBER(type_offset) offsetof(struct service_settings, name),
-       MEMBER(struct_size) sizeof(struct service_settings),
+       .type_offset = offsetof(struct service_settings, name),
+       .struct_size = sizeof(struct service_settings),
 
-       MEMBER(parent_offset) offsetof(struct service_settings, master_set),
-       MEMBER(parent) &master_setting_parser_info
+       .parent_offset = offsetof(struct service_settings, master_set),
+       .parent = &master_setting_parser_info
 };
 
 #undef DEF
@@ -191,44 +188,43 @@ static const struct setting_define master_setting_defines[] = {
 };
 
 static const struct master_settings master_default_settings = {
-       MEMBER(base_dir) PKG_RUNDIR,
-       MEMBER(libexec_dir) PKG_LIBEXECDIR,
-       MEMBER(protocols) "imap pop3 lmtp",
-       MEMBER(listen) "*, ::",
-       MEMBER(ssl) "yes:no:required",
-       MEMBER(default_process_limit) 100,
-       MEMBER(default_client_limit) 1000,
-       MEMBER(default_vsz_limit) 256*1024*1024,
-
-       MEMBER(version_ignore) FALSE,
-       MEMBER(mail_debug) FALSE,
-       MEMBER(auth_debug) FALSE,
-
-       MEMBER(first_valid_uid) 500,
-       MEMBER(last_valid_uid) 0,
-       MEMBER(first_valid_gid) 1,
-       MEMBER(last_valid_gid) 0,
+       .base_dir = PKG_RUNDIR,
+       .libexec_dir = PKG_LIBEXECDIR,
+       .protocols = "imap pop3 lmtp",
+       .listen = "*, ::",
+       .ssl = "yes:no:required",
+       .default_process_limit = 100,
+       .default_client_limit = 1000,
+       .default_vsz_limit = 256*1024*1024,
+
+       .version_ignore = FALSE,
+       .mail_debug = FALSE,
+       .auth_debug = FALSE,
+
+       .first_valid_uid = 500,
+       .last_valid_uid = 0,
+       .first_valid_gid = 1,
+       .last_valid_gid = 0,
 
 #ifndef CONFIG_BINARY
-       MEMBER(services) ARRAY_INIT
+       .services = ARRAY_INIT
 #else
-       MEMBER(services) { { &config_all_services_buf,
+       .services = { { &config_all_services_buf,
                             sizeof(struct service_settings *) } },
 #endif
 };
 
 const struct setting_parser_info master_setting_parser_info = {
-       MEMBER(module_name) "master",
-       MEMBER(defines) master_setting_defines,
-       MEMBER(defaults) &master_default_settings,
+       .module_name = "master",
+       .defines = master_setting_defines,
+       .defaults = &master_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct master_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct master_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) master_settings_verify
+       .check_func = master_settings_verify
 };
 
 /* <settings checks> */
index 363b9e2be43813f298ac46829dd94d31b69a20a5..ee2fd263743c3a6f1be18a77a8062d46b8b5cc49 100644 (file)
@@ -60,11 +60,8 @@ static const struct acl_letter_map acl_letter_map[] = {
 };
 
 static struct dotlock_settings dotlock_set = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 30,
-       MEMBER(stale_timeout) 120
+       .timeout = 30,
+       .stale_timeout = 120
 };
 
 static struct acl_backend *acl_backend_vfile_alloc(void)
index 2f5849896f5b53dd4f4c9b209477f56e58c2ff16..b69f3288f87837de88ff13dce503f49da26766c4 100644 (file)
 #define CONVERT_LOCK_FILENAME ".dovecot.convert"
 
 static struct dotlock_settings dotlock_settings = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 60*5,
-       MEMBER(stale_timeout) 60*5
+       .timeout = 60*5,
+       .stale_timeout = 60*5
 };
 
 static const char *storage_error(struct mail_storage *storage)
index fd306a3483456c0384ab459fcc439bdbbf9d2578..1c1d7d976a5737fbfe69f169fe9fa452b03b2108 100644 (file)
@@ -203,8 +203,8 @@ fts_backend_lucene_lookup(struct fts_backend *_backend,
 }
 
 struct fts_backend fts_backend_lucene = {
-       MEMBER(name) "lucene",
-       MEMBER(flags) 0,
+       .name = "lucene",
+       .flags = 0,
 
        {
                fts_backend_lucene_init,
index ddacd7d64f587ad6c2274b19bcaf066e6367c1fa..f1abf1d3de4cf66f9b2ee97e31c2a038223214b2 100644 (file)
@@ -797,8 +797,8 @@ static int fts_backend_solr_lookup(struct fts_backend_lookup_context *ctx,
 }
 
 struct fts_backend fts_backend_solr = {
-       MEMBER(name) "solr",
-       MEMBER(flags) FTS_BACKEND_FLAG_VIRTUAL_LOOKUPS,
+       .name = "solr",
+       .flags = FTS_BACKEND_FLAG_VIRTUAL_LOOKUPS,
 
        {
                fts_backend_solr_init,
index a18769366cb4bb47635a2971efc77764916ea01f..3fe3d06800bb6d2ae632910e096c826c8dbbdb4c 100644 (file)
@@ -241,8 +241,8 @@ fts_backend_squat_lookup(struct fts_backend *_backend, const char *key,
 }
 
 struct fts_backend fts_backend_squat = {
-       MEMBER(name) "squat",
-       MEMBER(flags) FTS_BACKEND_FLAG_SUBSTRING_LOOKUPS,
+       .name = "squat",
+       .flags = FTS_BACKEND_FLAG_SUBSTRING_LOOKUPS,
 
        {
                fts_backend_squat_init,
index 913ad0cdbf6d42302c24b839ad95e78e98ad0d0b..3eac07737cf24602b6e5f1cc2d7ad509cd85373d 100644 (file)
@@ -49,11 +49,8 @@ struct maildir_list_context {
 extern struct quota_backend quota_backend_maildir;
 
 static struct dotlock_settings dotlock_settings = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-
-       MEMBER(timeout) 0,
-       MEMBER(stale_timeout) 30
+       .timeout = 0,
+       .stale_timeout = 30
 };
 
 static int maildir_sum_dir(const char *dir, uint64_t *total_bytes,
index bf313e41a2deea7de47f196735b8f0606bf42b80..6212db9b1f647ad1d5949d50289f912129f9e4d5 100644 (file)
@@ -562,10 +562,10 @@ static void virtual_storage_add_list(struct mail_storage *storage ATTR_UNUSED,
 }
 
 struct mail_storage virtual_storage = {
-       MEMBER(name) VIRTUAL_STORAGE_NAME,
-       MEMBER(class_flags) 0,
+       .name = VIRTUAL_STORAGE_NAME,
+       .class_flags = 0,
 
-       {
+       .v = {
                NULL,
                virtual_storage_alloc,
                NULL,
@@ -579,11 +579,7 @@ struct mail_storage virtual_storage = {
 };
 
 struct mailbox virtual_mailbox = {
-       MEMBER(name) NULL, 
-       MEMBER(storage) NULL, 
-       MEMBER(list) NULL,
-
-       {
+       .v = {
                index_storage_is_readonly,
                index_storage_allow_new_keywords,
                index_storage_mailbox_enable,
index c812dd4954444da15f2e7a1aae2c862923913526..8bc69cdfbb06172e653be9fa245e997a26fd7104 100644 (file)
@@ -9,27 +9,27 @@
 #include <stddef.h>
 
 struct service_settings pop3_login_service_settings = {
-       MEMBER(name) "pop3-login",
-       MEMBER(protocol) "pop3",
-       MEMBER(type) "login",
-       MEMBER(executable) "pop3-login",
-       MEMBER(user) "dovecot",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "login",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 1,
-       MEMBER(vsz_limit) 64,
-
-       MEMBER(unix_listeners) ARRAY_INIT,
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "pop3-login",
+       .protocol = "pop3",
+       .type = "login",
+       .executable = "pop3-login",
+       .user = "dovecot",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "login",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 1,
+       .vsz_limit = 64,
+
+       .unix_listeners = ARRAY_INIT,
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 static const struct setting_define pop3_login_setting_defines[] = {
@@ -42,18 +42,13 @@ static const struct setting_parser_info *pop3_login_setting_dependencies[] = {
 };
 
 const struct setting_parser_info pop3_login_setting_parser_info = {
-       MEMBER(module_name) "pop3-login",
-       MEMBER(defines) pop3_login_setting_defines,
-       MEMBER(defaults) NULL,
+       .module_name = "pop3-login",
+       .defines = pop3_login_setting_defines,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) 0,
+       .type_offset = (size_t)-1,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
-
-       MEMBER(check_func) NULL,
-       MEMBER(dependencies) pop3_login_setting_dependencies
+       .dependencies = pop3_login_setting_dependencies
 };
 
 const struct setting_parser_info *pop3_login_setting_roots[] = {
index 71027cad8e1c6a89b5cb0fc00168c5391f5d2169..4e4c2b4472df6701137357f90802685ac289fac4 100644 (file)
@@ -27,28 +27,28 @@ static buffer_t pop3_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings pop3_service_settings = {
-       MEMBER(name) "pop3",
-       MEMBER(protocol) "pop3",
-       MEMBER(type) "",
-       MEMBER(executable) "pop3",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 1,
-       MEMBER(vsz_limit) -1U,
-
-       MEMBER(unix_listeners) { { &pop3_unix_listeners_buf,
-                                  sizeof(pop3_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "pop3",
+       .protocol = "pop3",
+       .type = "",
+       .executable = "pop3",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 1,
+       .vsz_limit = -1U,
+
+       .unix_listeners = { { &pop3_unix_listeners_buf,
+                             sizeof(pop3_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -74,16 +74,16 @@ static const struct setting_define pop3_setting_defines[] = {
 };
 
 static const struct pop3_settings pop3_default_settings = {
-       MEMBER(mail_debug) FALSE,
-       MEMBER(verbose_proctitle) FALSE,
-
-       MEMBER(pop3_no_flag_updates) FALSE,
-       MEMBER(pop3_enable_last) FALSE,
-       MEMBER(pop3_reuse_xuidl) FALSE,
-       MEMBER(pop3_save_uidl) FALSE,
-       MEMBER(pop3_lock_session) FALSE,
-       MEMBER(pop3_client_workarounds) "",
-       MEMBER(pop3_logout_format) "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s"
+       .mail_debug = FALSE,
+       .verbose_proctitle = FALSE,
+
+       .pop3_no_flag_updates = FALSE,
+       .pop3_enable_last = FALSE,
+       .pop3_reuse_xuidl = FALSE,
+       .pop3_save_uidl = FALSE,
+       .pop3_lock_session = FALSE,
+       .pop3_client_workarounds = "",
+       .pop3_logout_format = "top=%t/%p, retr=%r/%b, del=%d/%m, size=%s"
 };
 
 static const struct setting_parser_info *pop3_setting_dependencies[] = {
@@ -92,18 +92,17 @@ static const struct setting_parser_info *pop3_setting_dependencies[] = {
 };
 
 const struct setting_parser_info pop3_setting_parser_info = {
-       MEMBER(module_name) "pop3",
-       MEMBER(defines) pop3_setting_defines,
-       MEMBER(defaults) &pop3_default_settings,
+       .module_name = "pop3",
+       .defines = pop3_setting_defines,
+       .defaults = &pop3_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct pop3_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct pop3_settings),
 
-       MEMBER(parent_offset) (size_t)-1,
-       MEMBER(parent) NULL,
+       .parent_offset = (size_t)-1,
 
-       MEMBER(check_func) pop3_settings_verify,
-       MEMBER(dependencies) pop3_setting_dependencies
+       .check_func = pop3_settings_verify,
+       .dependencies = pop3_setting_dependencies
 };
 
 /* <settings checks> */
index 6fa35aeff14e967fdb6bc8f788c531b9a8e89706..52879dd4c309f228677036f2870c1ed5377fe3e4 100644 (file)
@@ -24,28 +24,28 @@ static buffer_t ssl_params_unix_listeners_buf = {
 /* </settings checks> */
 
 struct service_settings ssl_params_service_settings = {
-       MEMBER(name) "ssl-params",
-       MEMBER(protocol) "",
-       MEMBER(type) "",
-       MEMBER(executable) "ssl-params",
-       MEMBER(user) "",
-       MEMBER(group) "",
-       MEMBER(privileged_group) "",
-       MEMBER(extra_groups) "",
-       MEMBER(chroot) "",
-
-       MEMBER(drop_priv_before_exec) FALSE,
-
-       MEMBER(process_min_avail) 0,
-       MEMBER(process_limit) 0,
-       MEMBER(client_limit) 0,
-       MEMBER(service_count) 0,
-       MEMBER(vsz_limit) -1U,
-
-       MEMBER(unix_listeners) { { &ssl_params_unix_listeners_buf,
-                                  sizeof(ssl_params_unix_listeners[0]) } },
-       MEMBER(fifo_listeners) ARRAY_INIT,
-       MEMBER(inet_listeners) ARRAY_INIT
+       .name = "ssl-params",
+       .protocol = "",
+       .type = "",
+       .executable = "ssl-params",
+       .user = "",
+       .group = "",
+       .privileged_group = "",
+       .extra_groups = "",
+       .chroot = "",
+
+       .drop_priv_before_exec = FALSE,
+
+       .process_min_avail = 0,
+       .process_limit = 0,
+       .client_limit = 0,
+       .service_count = 0,
+       .vsz_limit = -1U,
+
+       .unix_listeners = { { &ssl_params_unix_listeners_buf,
+                             sizeof(ssl_params_unix_listeners[0]) } },
+       .fifo_listeners = ARRAY_INIT,
+       .inet_listeners = ARRAY_INIT
 };
 
 #undef DEF
@@ -59,18 +59,18 @@ static const struct setting_define ssl_params_setting_defines[] = {
 };
 
 static const struct ssl_params_settings ssl_params_default_settings = {
-       MEMBER(ssl_parameters_regenerate) 24*7
+       .ssl_parameters_regenerate = 24*7
 };
 
 const struct setting_parser_info ssl_params_setting_parser_info = {
-       MEMBER(module_name) "ssl-params",
-       MEMBER(defines) ssl_params_setting_defines,
-       MEMBER(defaults) &ssl_params_default_settings,
+       .module_name = "ssl-params",
+       .defines = ssl_params_setting_defines,
+       .defaults = &ssl_params_default_settings,
 
-       MEMBER(type_offset) (size_t)-1,
-       MEMBER(struct_size) sizeof(struct ssl_params_settings),
+       .type_offset = (size_t)-1,
+       .struct_size = sizeof(struct ssl_params_settings),
 
-       MEMBER(parent_offset) (size_t)-1
+       .parent_offset = (size_t)-1
 };
 
 struct ssl_params_settings *
index 1d4576b4ea2cf871ad255bad6b063e5857cd7bd8..bb8d4327d949e73cba157dafbe56836df0a21be8 100644 (file)
 #include <signal.h>
 
 static struct dotlock_settings dotlock_settings = {
-       MEMBER(temp_prefix) NULL,
-       MEMBER(lock_suffix) NULL,
-       MEMBER(timeout) 0,
-       MEMBER(stale_timeout) MAILDIR_UIDLIST_LOCK_STALE_TIMEOUT,
-       MEMBER(use_excl_lock) FALSE,
-       MEMBER(nfs_flush) FALSE,
-       MEMBER(use_io_notify) TRUE
+       .stale_timeout = MAILDIR_UIDLIST_LOCK_STALE_TIMEOUT,
+       .use_io_notify = TRUE
 };
 
 static struct ioloop *ioloop;