diff options
Diffstat (limited to 'modules/mailutils/mailutils.c')
| -rw-r--r-- | modules/mailutils/mailutils.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/mailutils/mailutils.c b/modules/mailutils/mailutils.c index fff7429..26d04d6 100644 --- a/modules/mailutils/mailutils.c +++ b/modules/mailutils/mailutils.c @@ -1,8 +1,8 @@ /* This file is part of Smap. - Copyright (C) 2006-2010, 2014 Sergey Poznyakoff + Copyright (C) 2006-2010, 2014, 2016 Sergey Poznyakoff Smap is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -15,14 +15,12 @@ along with Smap. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif #include <mailutils/mailutils.h> -#include <mailutils/cfg.h> -#include <mailutils/libcfg.h> #include <mailutils/sys/stream.h> #include <sysexits.h> #include <smap/stream.h> #include <smap/diag.h> #include <smap/module.h> #include <smap/parseopt.h> @@ -371,17 +369,17 @@ static const char *capa[] = { "mailbox", "logging", NULL }; static struct mu_cfg_param cfg_param[] = { - { "positive-reply", mu_cfg_string, &dfl_positive_reply, 0, NULL, + { "positive-reply", mu_c_string, &dfl_positive_reply, 0, NULL, "set default positive reply text" }, - { "negative-reply", mu_cfg_string, &dfl_negative_reply, 0, NULL, + { "negative-reply", mu_c_string, &dfl_negative_reply, 0, NULL, "set default negative reply text" }, - { "onerror-reply", mu_cfg_string, &dfl_onerror_reply, 0, NULL, + { "onerror-reply", mu_c_string, &dfl_onerror_reply, 0, NULL, "set default error reply text" }, { NULL } }; struct cap_buf { @@ -574,13 +572,13 @@ create_log_stream (mu_stream_t *pstream) static void init_hints(struct mu_cfg_parse_hints *hints) { hints->flags |= MU_PARSE_CONFIG_PLAIN | MU_CFG_PARSE_SITE_RCFILE | MU_CFG_PARSE_PROGRAM; - hints->site_rcfile = mu_site_rcfile; + hints->site_rcfile = mu_site_config_file(); hints->program = (char*) mu_program_name; } static int mod_mailutils_init(int argc, char **argv) { |