[dovecot-cvs] dovecot/src/master master-settings.c,1.25,1.26
master-settings.h,1.16,1.17
cras at procontrol.fi
cras at procontrol.fi
Sun Aug 24 11:21:32 EEST 2003
- Previous message: [dovecot-cvs] dovecot/src/lib-index mail-index-open.c,1.46,1.47
mail-index.h,1.90,1.91
- Next message: [dovecot-cvs] dovecot/src/master auth-process.c,1.49,1.50
login-process.c,1.47,1.48 master-settings.c,1.26,1.27
master-settings.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv29247/src/master
Modified Files:
master-settings.c master-settings.h
Log Message:
Reading global auth_* defaults didn't work
Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- master-settings.c 20 Aug 2003 22:12:44 -0000 1.25
+++ master-settings.c 24 Aug 2003 07:21:30 -0000 1.26
@@ -512,7 +512,7 @@
auth = p_new(settings_pool, struct auth_settings, 1);
/* copy defaults */
- *auth = default_auth_settings;
+ *auth = server->auth_defaults;
auth->parent = server;
auth->name = p_strdup(settings_pool, name);
@@ -619,13 +619,7 @@
if (error == NULL)
return NULL;
- /* backwards compatibility */
if (strncmp(key, "auth_", 5) == 0) {
- if (ctx->auth == NULL) {
- return "Authentication process name "
- "not defined yet";
- }
-
return parse_setting_from_defs(settings_pool,
auth_setting_defs,
ctx->auth,
@@ -633,6 +627,8 @@
}
return error;
case SETTINGS_TYPE_AUTH:
+ if (strncmp(key, "auth_", 5) == 0)
+ key += 5;
return parse_setting_from_defs(settings_pool, auth_setting_defs,
ctx->auth, key, value);
case SETTINGS_TYPE_NAMESPACE:
@@ -655,6 +651,7 @@
server->name = p_strdup(settings_pool, name);
server->imap = p_new(settings_pool, struct settings, 1);
server->pop3 = p_new(settings_pool, struct settings, 1);
+ server->auth_defaults = default_auth_settings;
*server->imap = *imap_defaults;
*server->pop3 = *pop3_defaults;
@@ -687,7 +684,7 @@
ctx->type = ctx->parent_type;
ctx->parent_type = SETTINGS_TYPE_ROOT;
ctx->server = ctx->root;
- ctx->auth = NULL;
+ ctx->auth = &ctx->root->auth_defaults;
ctx->namespace = NULL;
}
return TRUE;
@@ -702,8 +699,7 @@
ctx->parent_type = ctx->type;
ctx->type = SETTINGS_TYPE_SERVER;
- ctx->server = create_new_server(name,
- ctx->server->imap,
+ ctx->server = create_new_server(name, ctx->server->imap,
ctx->server->pop3);
server = ctx->root;
while (server->next != NULL)
@@ -778,6 +774,7 @@
ctx.server = ctx.root =
create_new_server("default",
&default_settings, &default_settings);
+ ctx.auth = &ctx.server->auth_defaults;
if (!settings_read(path, NULL, parse_setting, parse_section, &ctx))
return FALSE;
Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- master-settings.h 27 Jul 2003 05:37:58 -0000 1.16
+++ master-settings.h 24 Aug 2003 07:21:30 -0000 1.17
@@ -7,17 +7,6 @@
MAIL_PROTOCOL_POP3
};
-struct server_settings {
- struct server_settings *next;
-
- const char *name;
- struct settings *defaults;
- struct settings *imap;
- struct settings *pop3;
- struct auth_settings *auths;
- struct namespace_settings *namespaces;
-};
-
struct settings {
struct server_settings *server;
enum mail_protocol protocol;
@@ -127,6 +116,18 @@
const char *separator;
const char *prefix;
const char *location;
+};
+
+struct server_settings {
+ struct server_settings *next;
+
+ const char *name;
+ struct settings *defaults;
+ struct settings *imap;
+ struct settings *pop3;
+ struct auth_settings *auths;
+ struct auth_settings auth_defaults;
+ struct namespace_settings *namespaces;
};
extern struct server_settings *settings_root;
- Previous message: [dovecot-cvs] dovecot/src/lib-index mail-index-open.c,1.46,1.47
mail-index.h,1.90,1.91
- Next message: [dovecot-cvs] dovecot/src/master auth-process.c,1.49,1.50
login-process.c,1.47,1.48 master-settings.c,1.26,1.27
master-settings.h,1.17,1.18
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the dovecot-cvs
mailing list