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/main.c | |
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/main.c')
-rw-r--r-- | src/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1160,10 +1160,10 @@ main(int argc, char **argv) | |||
1160 | mf_srvcfg_init(argv[0], N_("(milter | callout)")); | 1160 | mf_srvcfg_init(argv[0], N_("(milter | callout)")); |
1161 | 1161 | ||
1162 | mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">"); | 1162 | mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">"); |
1163 | mu_app_rcfile = DEFAULT_CONFIG_FILE; | 1163 | mu_site_rcfile = DEFAULT_CONFIG_FILE; |
1164 | init_arguments(&args); | 1164 | init_arguments(&args); |
1165 | rc = mfd_app_init(&argp, capa, mf_cfg_param, argc, argv, | 1165 | rc = mu_app_init(&argp, capa, mf_cfg_param, argc, argv, |
1166 | argpflag(argc, argv), &index, &args, NULL); | 1166 | argpflag(argc, argv), &index, &args); |
1167 | if (rc) | 1167 | if (rc) |
1168 | exit(EX_CONFIG); | 1168 | exit(EX_CONFIG); |
1169 | flush_arguments(&args); | 1169 | flush_arguments(&args); |