Mercurial > dovecot > core-2.2

annotate src/auth/auth-settings.c @ 10910:858ad8aa7f8b HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth: Auth master process is now running as default_internal_user by default. Workers are still running as root, so PAM will continue to work as before.
author Timo Sirainen <tss@iki.fi>
date Sun, 14 Mar 2010 15:28:31 +0200
parents cb26518a7e51
children 87c462c463cc
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"
10903
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
6 #include "master-service.h"
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
7 #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
8 #include "service-settings.h"
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
9 #include "auth-settings.h"
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
10
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
11 #include <stddef.h>
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
12
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
13 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
14 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
15
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
16 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
17 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
18 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
19
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
20 /* <settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
21 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
22 { "login/auth", 0666, "", "" },
10889
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
23 { "auth-client", 0600, "", "" },
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
24 { "auth-userdb", 0600, "", "" },
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
25 { "auth-master", 0600, "", "" }
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
26 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
27 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
28 &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
29 &auth_unix_listeners_array[1],
10889
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
30 &auth_unix_listeners_array[2],
653ae02bf8cf Create auth-client socket by default.
Timo Sirainen <tss@iki.fi>
parents: 10587
diff changeset
31 &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
32 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
33 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
34 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
35 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
36 /* </settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
37
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
38 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
39 .name = "auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
40 .protocol = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
41 .type = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
42 .executable = "auth",
10910
858ad8aa7f8b auth: Auth master process is now running as default_internal_user by default.
Timo Sirainen <tss@iki.fi>
parents: 10905
diff changeset
43 .user = "$default_internal_user",
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
44 .group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
45 .privileged_group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
46 .extra_groups = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
47 .chroot = "",
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
48
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
49 .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
50
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
51 .process_min_avail = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
52 .process_limit = 1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
53 .client_limit = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
54 .service_count = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
55 .vsz_limit = -1U,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
56
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
57 .unix_listeners = { { &auth_unix_listeners_buf,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
58 sizeof(auth_unix_listeners[0]) } },
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
59 .fifo_listeners = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
60 .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
61 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
62
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
63 /* <settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
64 static struct file_listener_settings auth_worker_unix_listeners_array[] = {
10910
858ad8aa7f8b auth: Auth master process is now running as default_internal_user by default.
Timo Sirainen <tss@iki.fi>
parents: 10905
diff changeset
65 { "auth-worker", 0600, "$default_internal_user", "" }
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
66 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
67 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
68 &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
69 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
70 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
71 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
72 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
73 /* </settings checks> */
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
74
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
75 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
76 .name = "auth-worker",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
77 .protocol = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
78 .type = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
79 .executable = "auth -w",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
80 .user = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
81 .group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
82 .privileged_group = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
83 .extra_groups = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
84 .chroot = "",
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
85
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
86 .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
87
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
88 .process_min_avail = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
89 .process_limit = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
90 .client_limit = 1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
91 .service_count = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
92 .vsz_limit = -1U,
10179
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
93
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
94 .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
95 sizeof(auth_worker_unix_listeners[0]) } },
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
96 .fifo_listeners = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
97 .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
98 };
afe52d60989c Moved default service settings from master.conf to source code.
Timo Sirainen <tss@iki.fi>
parents: 10177
diff changeset
99
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
100 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
101 #define DEF(type, name) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
102 { type, #name, offsetof(struct auth_passdb_settings, name), NULL }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
103
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
104 static const struct setting_define auth_passdb_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
105 DEF(SET_STR, driver),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
106 DEF(SET_STR, args),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
107 DEF(SET_BOOL, deny),
10576
9c80cc65def8 auth: passdb { pass and master } settings weren't working.
Timo Sirainen <tss@iki.fi>
parents: 10410
diff changeset
108 DEF(SET_BOOL, pass),
9c80cc65def8 auth: passdb { pass and master } settings weren't working.
Timo Sirainen <tss@iki.fi>
parents: 10410
diff changeset
109 DEF(SET_BOOL, master),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
110
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
111 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
112 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
113
10905
cb26518a7e51 auth: Fixed compiling config binary.
Timo Sirainen <tss@iki.fi>
parents: 10903
diff changeset
114 static const struct auth_passdb_settings auth_passdb_default_settings = {
10897
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
115 .driver = "",
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
116 .args = "",
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
117 .deny = FALSE,
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
118 .pass = FALSE,
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
119 .master = FALSE
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
120 };
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
121
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
122 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
123 .defines = auth_passdb_setting_defines,
10905
cb26518a7e51 auth: Fixed compiling config binary.
Timo Sirainen <tss@iki.fi>
parents: 10903
diff changeset
124 .defaults = &auth_passdb_default_settings,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
125
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
126 .type_offset = (size_t)-1,
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
127 .struct_size = sizeof(struct auth_passdb_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
128
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
129 .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
130 .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
131
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
132 .check_func = auth_passdb_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
133 };
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 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
136 #define DEF(type, name) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
137 { type, #name, offsetof(struct auth_userdb_settings, name), NULL }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
138
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
139 static const struct setting_define auth_userdb_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
140 DEF(SET_STR, driver),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
141 DEF(SET_STR, args),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
142
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
143 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
144 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
145
10905
cb26518a7e51 auth: Fixed compiling config binary.
Timo Sirainen <tss@iki.fi>
parents: 10903
diff changeset
146 static const struct auth_userdb_settings auth_userdb_default_settings = {
10897
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
147 .driver = "",
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
148 .args = ""
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
149 };
52eb8317514f auth: Cleaned up struct auth_passdb/auth_userdb.
Timo Sirainen <tss@iki.fi>
parents: 10896
diff changeset
150
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
151 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
152 .defines = auth_userdb_setting_defines,
10905
cb26518a7e51 auth: Fixed compiling config binary.
Timo Sirainen <tss@iki.fi>
parents: 10903
diff changeset
153 .defaults = &auth_userdb_default_settings,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
154
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
155 .type_offset = (size_t)-1,
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
156 .struct_size = sizeof(struct auth_userdb_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
157
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
158 .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
159 .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
160
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
161 .check_func = auth_userdb_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
162 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
163
9834
3f4d796db5fd config: Auth settings now require the "auth_" prefix also inside auth blocks.
Timo Sirainen <tss@iki.fi>
parents: 9451
diff changeset
164 /* 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
165 #undef DEF
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
166 #undef DEFLIST
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
167 #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
168 { type, "auth_"#name, offsetof(struct auth_settings, name), NULL }
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
169 #define DEFLIST(field, name, defines) \
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
170 { SET_DEFLIST, name, offsetof(struct auth_settings, field), defines }
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
171
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
172 static const struct setting_define auth_setting_defines[] = {
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
173 DEF(SET_STR, mechanisms),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
174 DEF(SET_STR, realms),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
175 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
176 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
177 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
178 DEF(SET_TIME, cache_negative_ttl),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
179 DEF(SET_STR, username_chars),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
180 DEF(SET_STR, username_translation),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
181 DEF(SET_STR, username_format),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
182 DEF(SET_STR, master_user_separator),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
183 DEF(SET_STR, anonymous_username),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
184 DEF(SET_STR, krb5_keytab),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
185 DEF(SET_STR, gssapi_hostname),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
186 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
187 DEF(SET_TIME, failure_delay),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
188
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
189 DEF(SET_BOOL, verbose),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
190 DEF(SET_BOOL, debug),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
191 DEF(SET_BOOL, debug_passwords),
10585
941511db13c3 Added auth_verbose_passwords = no|plain|sha1.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
192 DEF(SET_ENUM, verbose_passwords),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
193 DEF(SET_BOOL, ssl_require_client_cert),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
194 DEF(SET_BOOL, ssl_username_from_cert),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
195 DEF(SET_BOOL, use_winbind),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
196
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
197 DEF(SET_UINT, worker_max_count),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
198
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
199 DEFLIST(passdbs, "passdb", &auth_passdb_setting_parser_info),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
200 DEFLIST(userdbs, "userdb", &auth_userdb_setting_parser_info),
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
201
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
202 SETTING_DEFINE_LIST_END
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
203 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
204
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
205 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
206 .mechanisms = "plain",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
207 .realms = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
208 .default_realm = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
209 .cache_size = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
210 .cache_ttl = 60*60,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
211 .cache_negative_ttl = 0,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
212 .username_chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890.-_@",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
213 .username_translation = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
214 .username_format = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
215 .master_user_separator = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
216 .anonymous_username = "anonymous",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
217 .krb5_keytab = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
218 .gssapi_hostname = "",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
219 .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
220 .failure_delay = 2,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
221
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
222 .verbose = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
223 .debug = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
224 .debug_passwords = FALSE,
10585
941511db13c3 Added auth_verbose_passwords = no|plain|sha1.
Timo Sirainen <tss@iki.fi>
parents: 10582
diff changeset
225 .verbose_passwords = "no:plain:sha1",
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
226 .ssl_require_client_cert = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
227 .ssl_username_from_cert = FALSE,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
228 .use_winbind = FALSE,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
229
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
230 .worker_max_count = 30,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
231
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
232 .passdbs = ARRAY_INIT,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
233 .userdbs = ARRAY_INIT
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
234 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
235
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
236 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
237 .module_name = "auth",
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
238 .defines = auth_setting_defines,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
239 .defaults = &auth_default_settings,
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
240
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
241 .type_offset = (size_t)-1,
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
242 .struct_size = sizeof(struct auth_settings),
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
243
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
244 .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
245
10410
b757dab45756 Removed MEMBER() macro. Require C99 style struct initializer.
Timo Sirainen <tss@iki.fi>
parents: 10282
diff changeset
246 .check_func = auth_settings_check
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
247 };
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
248
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
249 /* <settings checks> */
10892
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
250 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
251 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
252 {
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
253 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
254 const char *p;
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
255
9451
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
256 if (set->debug_passwords)
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
257 set->debug = TRUE;
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
258 if (set->debug)
d86490ef27bd auth: Fixed auth_debug_password -> auth_debug -> auth_Verbose cascading.
Timo Sirainen <tss@iki.fi>
parents: 9267
diff changeset
259 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
260
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
261 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
262 /* 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
263 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
264 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
265 } else {
10896
f93195ae4bed auth: Recent changes broke auth_username_chars checking.
Timo Sirainen <tss@iki.fi>
parents: 10893
diff changeset
266 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
267 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
268 }
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
269
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
270 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
271 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
272 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
273 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
274 }
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
275 set->realms_arr =
9675d9a54ac9 auth: Moved some variables generated from settings to struct auth_settings.
Timo Sirainen <tss@iki.fi>
parents: 10889
diff changeset
276 (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
277 return TRUE;
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
278 }
10578
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
279
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
280 static bool
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
281 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
282 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
283 {
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
284 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
285
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
286 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
287 *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
288 return FALSE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
289 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
290 return TRUE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
291 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
292
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
293 static bool
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
294 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
295 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
296 {
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
297 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
298
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
299 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
300 *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
301 return FALSE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
302 }
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
303 return TRUE;
a2ed5c020cfa auth: Don't use section names for passdb/userdb driver names.
Timo Sirainen <tss@iki.fi>
parents: 10576
diff changeset
304 }
9261
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
305 /* </settings checks> */
5e80d667a827 auth settings: Make sure we have a section name defined.
Timo Sirainen <tss@iki.fi>
parents: 9244
diff changeset
306
10893
1a4c2e4bff75 auth: auth_userdb and auth_passdb no longer has pointer to struct auth.
Timo Sirainen <tss@iki.fi>
parents: 10892
diff changeset
307 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
308
10903
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
309 struct auth_settings *auth_settings_read(const char *service)
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
310 {
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
311 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
312 &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
313 NULL
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
314 };
10903
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
315 struct master_service_settings_input input;
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
316 struct master_service_settings_output output;
9159
6324a79d3ee1 Initial commit for v2.0 master rewrite. Several features are still missing.
Timo Sirainen <tss@iki.fi>
parents: 9057
diff changeset
317 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
318 void **sets;
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
319
10903
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
320 memset(&input, 0, sizeof(input));
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
321 input.roots = set_roots;
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
322 input.module = "auth";
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
323 input.service = service;
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
324 if (master_service_settings_read(master_service, &input,
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
325 &output, &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
326 i_fatal("Error reading configuration: %s", error);
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
327
10903
6e639833c3fc auth: Initial support for per-protocol auth settings.
Timo Sirainen <tss@iki.fi>
parents: 10897
diff changeset
328 sets = master_service_settings_get_others(master_service);
9846
cf27080f3fcf config: Removed auth sections completely for now.
Timo Sirainen <tss@iki.fi>
parents: 9834
diff changeset
329 return sets[0];
9002
9d0037a997f4 Initial commit for config rewrite.
Timo Sirainen <tss@iki.fi>
parents:
diff changeset
330 }