diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-11-08 20:42:59 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-11-08 20:42:59 +0200 |
commit | 37d0487c83e7ff2423e7f995baf603849dab73f8 (patch) | |
tree | 6828f5314887c50687a29f216acf9c88f9dfe81d /src/main.c | |
parent | 172ada3fcdeb3a2c02f905792a398567820e53c4 (diff) | |
download | mailfromd-37d0487c83e7ff2423e7f995baf603849dab73f8.tar.gz mailfromd-37d0487c83e7ff2423e7f995baf603849dab73f8.tar.bz2 |
Use single configuration file.
* lib/libmf.h (MF_GETOPT_DEFAULT)
(MF_GETOPT_IN_ORDER,MF_GETOPT_NO_CONFIG): New flags.
(mf_getopt): Change signature.
* lib/mfgetopt.c (mf_getopt): Remove the cfile parameter.
Change semantics of the 5th parameter (inorder -> flags).
* mtasim/mtasim.c: Change call to mf_getopt.
* pmult/pmult.c: Likewise.
* src/calloutd.c: Likewise.
* src/main.c: Likewise.
* src/mfdbtool.c: Likewise.
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1122,16 +1122,16 @@ args_in_order(int argc, char **argv) int flag = 0; for (i = 0; i < argc; i++) { size_t len = strcspn(argv[i], "="); if (len > 3 && (memcmp(argv[i], "--ru", 4) == 0 || memcmp(argv[i], "--run", 5) == 0)) { - return 1; + return MF_GETOPT_IN_ORDER; } } - return 0; + return MF_GETOPT_DEFAULT; } static void provide_default_milter_server(void) { @@ -1283,14 +1283,13 @@ main(int argc, char **argv) dnsbase_init(); mu_acl_cfg_init(); database_cfg_init(); srvman_init(); mf_srvcfg_init(argv[0], "(milter | callout)"); - mf_getopt(&cli, &argc, &argv, capa, args_in_order(argc, argv), - DEFAULT_CONFIG_FILE); + mf_getopt(&cli, &argc, &argv, capa, args_in_order(argc, argv)); if (validate_options()) exit(EX_USAGE); init_relayed_domains(); |