Mercurial > dovecot > core-2.2

annotate src/auth/auth-settings.c @ 10896:f93195ae4bed HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth: Recent changes broke auth_username_chars checking.
author Timo Sirainen <tss@iki.fi>
date Sat, 13 Mar 2010 19:36:30 +0200
parents 1a4c2e4bff75
children 52eb8317514f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
10582
615eef3139c2 Updated copyright notices to include year 2010.
Timo Sirainen <tss@iki.fi>
parents: 10578
diff changeset
1 /* Copyright (c) 2005-2010 Dovecot authors, see the included COPYING file */
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
2
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
3 #include "lib.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
4 #include "array.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
5 #include "settings-parser.h"
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
6 #include "master-service-settings.h"
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
7 #include "service-settings.h"
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
8 #include "auth-settings.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10 #include <stddef.h>
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
12 extern const struct setting_parser_info auth_setting_parser_info;
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
13 extern const struct setting_parser_info auth_root_setting_parser_info;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
14
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
15 static bool auth_settings_check(void *_set, pool_t pool, const char **error_r);
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
16 static bool auth_passdb_settings_check(void *_set, pool_t pool, const char **error_r);
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
17 static bool auth_userdb_settings_check(void *_set, pool_t pool, const char **error_r);
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
18
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
19 /* <settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
20 static struct file_listener_settings auth_unix_listeners_array[] = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
21 { "login/auth", 0666, "", "" },
10889
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
22 { "auth-client", 0600, "", "" },
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
23 { "auth-userdb", 0600, "", "" },
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
24 { "auth-master", 0600, "", "" }
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
25 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
26 static struct file_listener_settings *auth_unix_listeners[] = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
27 &auth_unix_listeners_array[0],
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
28 &auth_unix_listeners_array[1],
10889
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
29 &auth_unix_listeners_array[2],
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
30 &auth_unix_listeners_array[3]
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
31 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
32 static buffer_t auth_unix_listeners_buf = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
33 auth_unix_listeners, sizeof(auth_unix_listeners), { 0, }
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
34 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
35 /* </settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
36
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
37 struct service_settings auth_service_settings = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
38 .name = "auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
39 .protocol = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
40 .type = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
41 .executable = "auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
42 .user = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
43 .group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
44 .privileged_group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
45 .extra_groups = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
46 .chroot = "",
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
47
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
48 .drop_priv_before_exec = FALSE,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
49
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
50 .process_min_avail = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
51 .process_limit = 1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
52 .client_limit = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
53 .service_count = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
54 .vsz_limit = -1U,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
55
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
56 .unix_listeners = { { &auth_unix_listeners_buf,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
57 sizeof(auth_unix_listeners[0]) } },
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
58 .fifo_listeners = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
59 .inet_listeners = ARRAY_INIT
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
60 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
61
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
62 /* <settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
63 static struct file_listener_settings auth_worker_unix_listeners_array[] = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
64 { "auth-worker", 0600, "", "" }
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
65 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
66 static struct file_listener_settings *auth_worker_unix_listeners[] = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
67 &auth_worker_unix_listeners_array[0]
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
68 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
69 static buffer_t auth_worker_unix_listeners_buf = {
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
70 auth_worker_unix_listeners, sizeof(auth_worker_unix_listeners), { 0, }
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
71 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
72 /* </settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
73
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
74 struct service_settings auth_worker_service_settings = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
75 .name = "auth-worker",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
76 .protocol = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
77 .type = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
78 .executable = "auth -w",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
79 .user = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
80 .group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
81 .privileged_group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
82 .extra_groups = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
83 .chroot = "",
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
84
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
85 .drop_priv_before_exec = FALSE,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
86
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
87 .process_min_avail = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
88 .process_limit = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
89 .client_limit = 1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
90 .service_count = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
91 .vsz_limit = -1U,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
92
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
93 .unix_listeners = { { &auth_worker_unix_listeners_buf,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
94 sizeof(auth_worker_unix_listeners[0]) } },
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
95 .fifo_listeners = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
96 .inet_listeners = ARRAY_INIT
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
97 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
98
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
99 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
100 #define DEF(type, name) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
101 { type, #name, offsetof(struct auth_passdb_settings, name), NULL }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
102
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
103 static const struct setting_define auth_passdb_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
104 DEF(SET_STR, driver),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105 DEF(SET_STR, args),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
106 DEF(SET_BOOL, deny),
10576
9c80cc65def8 auth: passdb { pass and master } settings weren't working.
Timo Sirainen <tss@iki.fi>
parents: 10410
diff changeset
107 DEF(SET_BOOL, pass),
9c80cc65def8 auth: passdb { pass and master } settings weren't working.
Timo Sirainen <tss@iki.fi>
parents: 10410
diff changeset
108 DEF(SET_BOOL, master),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
109
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
110 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
111 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
112
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
113 const struct setting_parser_info auth_passdb_setting_parser_info = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
114 .defines = auth_passdb_setting_defines,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
115
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
116 .type_offset = (size_t)-1,
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
117 .struct_size = sizeof(struct auth_passdb_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
118
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
119 .parent_offset = (size_t)-1,
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
120 .parent = &auth_setting_parser_info,
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
121
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
122 .check_func = auth_passdb_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
123 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
124
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
125 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
126 #define DEF(type, name) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
127 { type, #name, offsetof(struct auth_userdb_settings, name), NULL }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
129 static const struct setting_define auth_userdb_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
130 DEF(SET_STR, driver),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
131 DEF(SET_STR, args),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
132
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
133 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
134 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
135
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
136 const struct setting_parser_info auth_userdb_setting_parser_info = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
137 .defines = auth_userdb_setting_defines,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
139 .type_offset = (size_t)-1,
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
140 .struct_size = sizeof(struct auth_userdb_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
142 .parent_offset = (size_t)-1,
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
143 .parent = &auth_setting_parser_info,
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
144
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
145 .check_func = auth_userdb_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
146 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
147
9834
3f4d796db5fd config: Auth settings now require the "auth_" prefix also inside auth blocks.
Timo Sirainen <tss@iki.fi>
parents: 9451
diff changeset
148 /* we're kind of kludging here to avoid "auth_" prefix in the struct fields */
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
149 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
150 #undef DEFLIST
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
151 #define DEF(type, name) \
9834
3f4d796db5fd config: Auth settings now require the "auth_" prefix also inside auth blocks.
Timo Sirainen <tss@iki.fi>
parents: 9451
diff changeset
152 { type, "auth_"#name, offsetof(struct auth_settings, name), NULL }
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
153 #define DEFLIST(field, name, defines) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154 { SET_DEFLIST, name, offsetof(struct auth_settings, field), defines }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
155
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
156 static const struct setting_define auth_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
157 DEF(SET_STR, mechanisms),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
158 DEF(SET_STR, realms),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
159 DEF(SET_STR, default_realm),
10281
4b663b9e63af Added "size" setting type, which supports B/k/M/G/T suffixes.
Timo Sirainen <tss@iki.fi>
parents: 10179
diff changeset
160 DEF(SET_SIZE, cache_size),
10282
7215f4142901 Added "time" (interval) setting type, which supports s/m/h/d/w suffixes.
Timo Sirainen <tss@iki.fi>
parents: 10281
diff changeset
161 DEF(SET_TIME, cache_ttl),
7215f4142901 Added "time" (interval) setting type, which supports s/m/h/d/w suffixes.
Timo Sirainen <tss@iki.fi>
parents: 10281
diff changeset
162 DEF(SET_TIME, cache_negative_ttl),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163 DEF(SET_STR, username_chars),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
164 DEF(SET_STR, username_translation),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
165 DEF(SET_STR, username_format),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 DEF(SET_STR, master_user_separator),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167 DEF(SET_STR, anonymous_username),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
168 DEF(SET_STR, krb5_keytab),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
169 DEF(SET_STR, gssapi_hostname),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
170 DEF(SET_STR, winbind_helper_path),
10282
7215f4142901 Added "time" (interval) setting type, which supports s/m/h/d/w suffixes.
Timo Sirainen <tss@iki.fi>
parents: 10281
diff changeset
171 DEF(SET_TIME, failure_delay),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
172
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173 DEF(SET_BOOL, verbose),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
174 DEF(SET_BOOL, debug),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
175 DEF(SET_BOOL, debug_passwords),
10585
941511db13c3 Added auth_verbose_passwords = no|plain|sha1.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
176 DEF(SET_ENUM, verbose_passwords),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
177 DEF(SET_BOOL, ssl_require_client_cert),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
178 DEF(SET_BOOL, ssl_username_from_cert),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
179 DEF(SET_BOOL, use_winbind),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 DEF(SET_UINT, worker_max_count),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 DEFLIST(passdbs, "passdb", &auth_passdb_setting_parser_info),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184 DEFLIST(userdbs, "userdb", &auth_userdb_setting_parser_info),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
187 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
189 static const struct auth_settings auth_default_settings = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
190 .mechanisms = "plain",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
191 .realms = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
192 .default_realm = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
193 .cache_size = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
194 .cache_ttl = 60*60,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
195 .cache_negative_ttl = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
196 .username_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
197 .username_translation = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
198 .username_format = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
199 .master_user_separator = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
200 .anonymous_username = "anonymous",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
201 .krb5_keytab = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
202 .gssapi_hostname = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
203 .winbind_helper_path = "/usr/bin/ntlm_auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
204 .failure_delay = 2,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
205
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
206 .verbose = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
207 .debug = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
208 .debug_passwords = FALSE,
10585
941511db13c3 Added auth_verbose_passwords = no|plain|sha1.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
209 .verbose_passwords = "no:plain:sha1",
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
210 .ssl_require_client_cert = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
211 .ssl_username_from_cert = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
212 .use_winbind = FALSE,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
213
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
214 .worker_max_count = 30,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
215
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
216 .passdbs = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
217 .userdbs = ARRAY_INIT
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
218 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
219
10177
d589d568a19d Changed all settings related structs to const and changed APIs to make it work.
Timo Sirainen <tss@iki.fi>
parents: 10107
diff changeset
220 const struct setting_parser_info auth_setting_parser_info = {
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
221 .module_name = "auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
222 .defines = auth_setting_defines,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
223 .defaults = &auth_default_settings,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
224
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
225 .type_offset = (size_t)-1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
226 .struct_size = sizeof(struct auth_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
227
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
228 .parent_offset = (size_t)-1,
10106
5a25b4ec5694 Reordered struct setting_parser_info fields to make using them easier.
Timo Sirainen <tss@iki.fi>
parents: 9846
diff changeset
229
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
230 .check_func = auth_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
232
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
233 /* <settings checks> */
10892
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
234 static bool auth_settings_check(void *_set, pool_t pool,
9846
cf27080f3fcf config: Removed auth sections completely for now.
Timo Sirainen <tss@iki.fi>
parents: 9834
diff changeset
235 const char **error_r ATTR_UNUSED)
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
236 {
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
237 struct auth_settings *set = _set;
10892
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
238 const char *p;
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
239
9451
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
240 if (set->debug_passwords)
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
241 set->debug = TRUE;
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
242 if (set->debug)
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
243 set->verbose = TRUE;
10892
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
244
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
245 if (*set->username_chars == '\0') {
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
246 /* all chars are allowed */
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
247 memset(set->username_chars_map, 1,
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
248 sizeof(set->username_chars_map));
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
249 } else {
10896
f93195ae4bed auth: Recent changes broke auth_username_chars checking.
Timo Sirainen <tss@iki.fi>
parents: 10893
diff changeset
250 for (p = set->username_chars; *p != '\0'; p++)
10892
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
251 set->username_chars_map[(int)(uint8_t)*p] = 1;
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
252 }
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
253
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
254 if (*set->username_translation != '\0') {
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
255 p = set->username_translation;
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
256 for (; *p != '\0' && p[1] != '\0'; p += 2)
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
257 set->username_translation_map[(int)(uint8_t)*p] = p[1];
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
258 }
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
259 set->realms_arr =
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
260 (const char *const *)p_strsplit_spaces(pool, set->realms, " ");
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
261 return TRUE;
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
262 }
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
263
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
264 static bool
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
265 auth_passdb_settings_check(void *_set, pool_t pool ATTR_UNUSED,
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
266 const char **error_r)
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
267 {
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
268 struct auth_passdb_settings *set = _set;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
269
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
270 if (set->driver == NULL || *set->driver == '\0') {
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
271 *error_r = "passdb is missing driver";
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
272 return FALSE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
273 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
274 return TRUE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
275 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
276
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
277 static bool
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
278 auth_userdb_settings_check(void *_set, pool_t pool ATTR_UNUSED,
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
279 const char **error_r)
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
280 {
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
281 struct auth_userdb_settings *set = _set;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
282
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
283 if (set->driver == NULL || *set->driver == '\0') {
10587
bea4b2d1f27f auth: Fixed "userdb is missing driver" error.
Timo Sirainen <tss@iki.fi>
parents: 10585
diff changeset
284 *error_r = "userdb is missing driver";
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
285 return FALSE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
286 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
287 return TRUE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
288 }
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
289 /* </settings checks> */
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
290
10893
1a4c2e4bff75 auth: auth_userdb and auth_passdb no longer has pointer to struct auth.
Timo Sirainen <tss@iki.fi>
parents: 10892
diff changeset
291 struct auth_settings *global_auth_settings;
1a4c2e4bff75 auth: auth_userdb and auth_passdb no longer has pointer to struct auth.
Timo Sirainen <tss@iki.fi>
parents: 10892
diff changeset
292
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
293 struct auth_settings *
9846
cf27080f3fcf config: Removed auth sections completely for now.
Timo Sirainen <tss@iki.fi>
parents: 9834
diff changeset
294 auth_settings_read(struct master_service *service)
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
295 {
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
296 static const struct setting_parser_info *set_roots[] = {
9846
cf27080f3fcf config: Removed auth sections completely for now.
Timo Sirainen <tss@iki.fi>
parents: 9834
diff changeset
297 &auth_setting_parser_info,
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
298 NULL
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
299 };
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
300 const char *error;
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
301 void **sets;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
302
9244
4bf901b4c402 mail processes now specify user/lip/rip in config requests.
Timo Sirainen <tss@iki.fi>
parents: 9159
diff changeset
303 if (master_service_settings_read_simple(service, set_roots, &error) < 0)
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
304 i_fatal("Error reading configuration: %s", error);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
305
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
306 sets = master_service_settings_get_others(service);
9846
cf27080f3fcf config: Removed auth sections completely for now.
Timo Sirainen <tss@iki.fi>
parents: 9834
diff changeset
307 return sets[0];
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
308 }