1 files changed, 8 insertions, 14 deletions

diff --git a/src/main.c b/src/main.c
index ccd31e69..1620fa2b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -78,7 +78,7 @@ int stack_trace_option;          /* Print stack traces on runtime errors */
 size_t max_match_mx = MAXMXCOUNT;
 
 char *main_function_name = "main";
-char *default_callout_url = DEFAULT_CALLOUT_SOCKET;
+char *callout_server_url;
 
 
 /* Preprocessor helper function */
@@ -894,9 +894,8 @@ struct mu_cfg_param mf_cfg_param[] = {
         { "milter-timeout", mu_cfg_callback, NULL, 0, cb_milter_timeout,
           N_("Set milter timeout."),
           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") },
         { "include-path", mu_cfg_callback, NULL, 0, cb_include_path,
           N_("Add directories to the list of directories to be searched for "
@@ -1104,16 +1103,11 @@ provide_default_callout_server()
         struct variable *var;
 
         if (provide_callout &&
+            !callout_server_url &&
             (!(var = variable_lookup("callout_server_url")) ||
              (var->sym.flags & SYM_REFERENCED) &&
              !(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);
         }
 }
 
@@ -1134,8 +1128,8 @@ mf_server_function(const char *key, struct mf_srvcfg *cfg)
         else if (strcmp(key, "callout") == 0) {
                 cfg->server = callout_session_server;
                 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));
         } else
                 return 1;
@@ -1184,7 +1178,7 @@ main(int argc, char **argv)
         mu_acl_cfg_init();
         database_cfg_init();
         srvman_init();
-        mf_srvcfg_init(N_("(milter | server)"));
+        mf_srvcfg_init(N_("(milter | callout)"));
         
         mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
         mu_app_rcfile = DEFAULT_CONFIG_FILE;