diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-07 15:52:54 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-07 15:52:54 +0200 |
| commit | e473ab7df422543a458a1226b1dd8e5febea2c35 (patch) | |
| tree | 3e31e4ba702c090144daf1a277f6867ce2063a88 /src | |
| parent | dc600bc236006a0ad672d2f07145576a7584bab5 (diff) | |
| download | mailfromd-e473ab7df422543a458a1226b1dd8e5febea2c35.tar.gz mailfromd-e473ab7df422543a458a1226b1dd8e5febea2c35.tar.bz2 | |
Sync with MU commit 4bcd5c9de0cb6ca85bcc3a35b1518739b939b009.
* lib/appinit.c: Remove.
* lib/Makefile.am (libmf_a_SOURCES): Remove appinit.c
* lib/libmf.h (mu_app_rcfile, mfd_app_init): Remove.
* src/calloutd.c (main): Use mu_app_init. Set mu_site_rcfile beforehand.
* src/main.c (main): Likewise.
* src/mfdbtool.c (main): Likewise.
Diffstat (limited to 'src')
| -rw-r--r-- | src/calloutd.c | 6 | ||||
| -rw-r--r-- | src/main.c | 6 | ||||
| -rw-r--r-- | src/mfdbtool.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/calloutd.c b/src/calloutd.c index 663732b3..6d51ed68 100644 --- a/src/calloutd.c +++ b/src/calloutd.c @@ -135,9 +135,9 @@ main(int argc, char **argv) mf_srvcfg_init(argv[0], NULL); mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">"); - mu_app_rcfile = SYSCONFDIR "/calloutd.conf"; - rc = mfd_app_init(&argp, capa, callout_cfg_param, argc, argv, - 0, NULL, NULL, NULL); + mu_site_rcfile = SYSCONFDIR "/calloutd.conf"; + rc = mu_app_init(&argp, capa, callout_cfg_param, argc, argv, + 0, NULL, NULL); if (rc) exit(EX_CONFIG); mf_srvcfg_flush(); @@ -1160,10 +1160,10 @@ main(int argc, char **argv) mf_srvcfg_init(argv[0], N_("(milter | callout)")); mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">"); - mu_app_rcfile = DEFAULT_CONFIG_FILE; + mu_site_rcfile = DEFAULT_CONFIG_FILE; init_arguments(&args); - rc = mfd_app_init(&argp, capa, mf_cfg_param, argc, argv, - argpflag(argc, argv), &index, &args, NULL); + rc = mu_app_init(&argp, capa, mf_cfg_param, argc, argv, + argpflag(argc, argv), &index, &args); if (rc) exit(EX_CONFIG); flush_arguments(&args); diff --git a/src/mfdbtool.c b/src/mfdbtool.c index 6d63a447..77e2bb64 100644 --- a/src/mfdbtool.c +++ b/src/mfdbtool.c @@ -441,10 +441,10 @@ main(int argc, char **argv) mf_optcache_add(option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC); mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">"); - mu_app_rcfile = SYSCONFDIR "/mfdbtool.conf"; /* FIXME: Use mailfromd.conf somehow? */ - rc = mfd_app_init(&argp, capa, callout_cfg_param, argc, argv, - 0, &index, NULL, NULL); + mu_site_rcfile = SYSCONFDIR "/mfdbtool.conf"; + rc = mu_app_init(&argp, capa, callout_cfg_param, argc, argv, + 0, &index, NULL); if (rc) exit(EX_CONFIG); |