Mercurial > dovecot > original-hg > dovecot-1.2

comparison src/master/master-settings.c @ 9256:d38e0412cfb4 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dovecot -n/-a now outputs also lda settings.
author Timo Sirainen <tss@iki.fi>
date Sun, 26 Jul 2009 21:56:17 -0400
parents 62b9661b4c7a
children 93759896b0d2
comparison
equal deleted inserted replaced
9255:1aec43edab2d 9256:d38e0412cfb4
1241 setting_defs, 1241 setting_defs,
1242 ctx->server->pop3, 1242 ctx->server->pop3,
1243 key, value); 1243 key, value);
1244 } 1244 }
1245 1245
1246 if (ctx->protocol == MAIL_PROTOCOL_LDA) {
1247 key = p_strdup(settings_pool, key);
1248 value = p_strdup(settings_pool, value);
1249
1250 array_append(&ctx->server->lda_settings, &key, 1);
1251 array_append(&ctx->server->lda_settings, &value, 1);
1252 }
1253
1246 if (error == NULL) 1254 if (error == NULL)
1247 return NULL; 1255 return NULL;
1248 1256
1249 if (strncmp(key, "auth_", 5) == 0) { 1257 if (strncmp(key, "auth_", 5) == 0) {
1250 return parse_setting_from_defs(settings_pool, 1258 return parse_setting_from_defs(settings_pool,
1322 1330
1323 *server->imap = *imap_defaults; 1331 *server->imap = *imap_defaults;
1324 *server->pop3 = *pop3_defaults; 1332 *server->pop3 = *pop3_defaults;
1325 1333
1326 p_array_init(&server->dicts, settings_pool, 4); 1334 p_array_init(&server->dicts, settings_pool, 4);
1335 p_array_init(&server->lda_settings, settings_pool, 12);
1327 p_array_init(&server->imap->plugin_envs, settings_pool, 8); 1336 p_array_init(&server->imap->plugin_envs, settings_pool, 8);
1328 p_array_init(&server->pop3->plugin_envs, settings_pool, 8); 1337 p_array_init(&server->pop3->plugin_envs, settings_pool, 8);
1329 1338
1330 server->imap->server = server; 1339 server->imap->server = server;
1331 server->imap->protocol = MAIL_PROTOCOL_IMAP; 1340 server->imap->protocol = MAIL_PROTOCOL_IMAP;
1814 printf("dict:\n"); 1823 printf("dict:\n");
1815 for (i = 0; i < count; i += 2) 1824 for (i = 0; i < count; i += 2)
1816 printf(" %s: %s\n", dicts[i], dicts[i+1]); 1825 printf(" %s: %s\n", dicts[i], dicts[i+1]);
1817 } 1826 }
1818 1827
1828 static void lda_settings_dump(const struct server_settings *set)
1829 {
1830 const char *const *ldas;
1831 unsigned int i, count;
1832
1833 ldas = array_get(&set->lda_settings, &count);
1834 i_assert((count % 2) == 0);
1835
1836 if (count == 0)
1837 return;
1838
1839 printf("lda:\n");
1840 for (i = 0; i < count; i += 2)
1841 printf(" %s: %s\n", ldas[i], ldas[i+1]);
1842 }
1843
1819 void master_settings_dump(struct server_settings *set, bool nondefaults) 1844 void master_settings_dump(struct server_settings *set, bool nondefaults)
1820 { 1845 {
1821 const void *sets[4]; 1846 const void *sets[4];
1822 const char *set_names[4]; 1847 const char *set_names[4];
1823 unsigned int count; 1848 unsigned int count;
1839 set_names[count] = "pop3"; 1864 set_names[count] = "pop3";
1840 count++; 1865 count++;
1841 } 1866 }
1842 settings_dump(setting_defs, sets, set_names, count, nondefaults, 0); 1867 settings_dump(setting_defs, sets, set_names, count, nondefaults, 0);
1843 namespace_settings_dump(set->namespaces, nondefaults); 1868 namespace_settings_dump(set->namespaces, nondefaults);
1869 lda_settings_dump(set);
1844 auth_settings_dump(set->auths, nondefaults); 1870 auth_settings_dump(set->auths, nondefaults);
1845 plugin_settings_dump(set->defaults); 1871 plugin_settings_dump(set->defaults);
1846 dict_settings_dump(set); 1872 dict_settings_dump(set);
1847 } 1873 }
1848 1874