diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-08-22 22:21:28 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-08-22 23:11:41 +0300 |
commit | dc8d3d50cbaca39447576ac0ac573ca8a84a2c05 (patch) | |
tree | d9a4f88f0fb0019a740d334d67a7215d66c0c8aa /src | |
parent | 84db5d2111b2f8ac9fd583ed13c106b620b8fefa (diff) | |
download | mailfromd-dc8d3d50cbaca39447576ac0ac573ca8a84a2c05.tar.gz mailfromd-dc8d3d50cbaca39447576ac0ac573ca8a84a2c05.tar.bz2 |
Fix starting of the default callout server. Reflect the actual server URL in callout_server_url.
* mflib/callout.mf4 (callout_server_url): New variable.
(begin): Provide a default for callout_server_url.
(__callout_open_default): Return the fd.
(callout): Use return from __callout_open_default as
the first argument to callout_do.
* mflib/poll.mf (__make_extra_arg): New static function.
(_pollhost, _pollmx, stdpoll, strictpoll): Use return from
__callout_open_default as the first argument to callout_do.
Construct the rest of arguments using __make_extra_arg.
* src/builtin/callout.bi (callout_server_url): Remove.
(default_callout_server_url): New function.
(MF_INIT): Remove initialization of callout_server_url.
* src/mailfromd.h (default_callout_url): Rename to
callout_server_url.
* src/main.c (default_callout_url): Rename to
callout_server_url.
(provide_default_callout_server): Rewrite the condition.
Don't try to reset the callout_server_url MFL variable: it
is useless after compilation is finished.
(mf_server_function): Fix the use of mu_list_locate.
(main): Fix a typo in the server section label.
* src/srvcfg.c (server_section_parser): Move the call to
mf_server_function to the mu_cfg_section_end branch.
Diffstat (limited to 'src')
-rw-r--r-- | src/builtin/callout.bi | 9 | ||||
-rw-r--r-- | src/mailfromd.h | 2 | ||||
-rw-r--r-- | src/main.c | 22 | ||||
-rw-r--r-- | src/srvcfg.c | 10 |
4 files changed, 21 insertions, 22 deletions
diff --git a/src/builtin/callout.bi b/src/builtin/callout.bi index 9c8affeb..dd4a61ee 100644 --- a/src/builtin/callout.bi +++ b/src/builtin/callout.bi @@ -20,3 +20,2 @@ -MF_VAR(callout_server_url, STRING, SYM_PRECIOUS); MF_VAR(ehlo_domain, STRING, SYM_PRECIOUS); @@ -32,2 +31,9 @@ MF_PRAGMA(provide-callout, 1, 1) +MF_DEFUN(default_callout_server_url, STRING) +{ + MF_RETURN_STRING(callout_server_url ? + callout_server_url : DEFAULT_CALLOUT_SOCKET); +} +END + static void @@ -43,3 +49,2 @@ initvar(const char *name, const char *str) MF_INIT([< - initvar("callout_server_url", default_callout_url); if (ehlo_domain) diff --git a/src/mailfromd.h b/src/mailfromd.h index 6fcc628f..37aa1c83 100644 --- a/src/mailfromd.h +++ b/src/mailfromd.h @@ -141,3 +141,3 @@ extern int stack_trace_option; extern const char *program_version; -extern char *default_callout_url; +extern char *callout_server_url; @@ -80,3 +80,3 @@ size_t max_match_mx = MAXMXCOUNT; char *main_function_name = "main"; -char *default_callout_url = DEFAULT_CALLOUT_SOCKET; +char *callout_server_url; @@ -896,5 +896,4 @@ struct mu_cfg_param mf_cfg_param[] = { N_("time") }, - { "callout-url", mu_cfg_string, &default_callout_url, 0, NULL, - N_("Sets the URL of the default callout server. " - "Deprecated. Use `setvar callout_server_url <url>;' instead."), + { "callout-url", mu_cfg_string, &callout_server_url, 0, NULL, + N_("Sets the URL of the default callout server."), N_("url") }, @@ -1106,2 +1105,3 @@ provide_default_callout_server() if (provide_callout && + !callout_server_url && (!(var = variable_lookup("callout_server_url")) || @@ -1109,9 +1109,3 @@ provide_default_callout_server() !(var->sym.flags & SYM_INITIALIZED))) { - struct value val; - - val.type = dtype_string; - val.v.literal = string_alloc(DEFAULT_CALLOUT_SOCKET, - sizeof(DEFAULT_CALLOUT_SOCKET)-1); - ensure_initialized_variable("callout_server_url", &val); - mf_srvcfg_add("callout", val.v.literal->text); + mf_srvcfg_add("callout", DEFAULT_CALLOUT_SOCKET); } @@ -1136,4 +1130,4 @@ mf_server_function(const char *key, struct mf_srvcfg *cfg) if (cfg->defopt || - mu_list_locate(cfg->options, "default", NULL)) - default_callout_url = + mu_list_locate(cfg->options, "default", NULL) == 0) + callout_server_url = xstrdup(mu_url_to_string(cfg->url)); @@ -1186,3 +1180,3 @@ main(int argc, char **argv) srvman_init(); - mf_srvcfg_init(N_("(milter | server)")); + mf_srvcfg_init(N_("(milter | callout)")); diff --git a/src/srvcfg.c b/src/srvcfg.c index 26f7fdd1..af444bfa 100644 --- a/src/srvcfg.c +++ b/src/srvcfg.c @@ -451,5 +451,8 @@ server_section_parser(enum mu_cfg_section_stage stage, server_config_stmt.reuseaddr = 1; - if (mu_cfg_assert_value_type (node->label, MU_CFG_STRING, - tree->debug)) + if (mu_cfg_assert_value_type(node->label, MU_CFG_STRING, + tree->debug)) return 1; + break; + + case mu_cfg_section_end: if (server_config_stmt.options) @@ -471,5 +474,2 @@ server_section_parser(enum mu_cfg_section_stage stage, } - break; - - case mu_cfg_section_end: if (!server_config_stmt.id) |