diff options
-rw-r--r-- | doc/Makefile.am | 8 | ||||
-rw-r--r-- | src/calloutd.c | 2 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/srvcfg.c | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 9dd98a05..ed48bcb4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -52,17 +52,17 @@ check-options: check-mailfromd-options check-calloutd-options check-mfdbtool-opt check-mailfromd-options: @check-docs.sh "mailfromd options" \ - '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ + '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ 's/@opindex *\([^@,]*\), --.*mailfromd option.*/\1/p' \ - $(top_srcdir)/src/main.c -- \ + $(top_srcdir)/src/main.c $(top_srcdir)/src/srvcfg.c -- \ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ $(info_TEXINFOS) check-calloutd-options: @check-docs.sh "calloutd options" \ - '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ + '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ 's/@opindex *\([^@,]*\), --.*calloutd option.*/\1/p' \ - $(top_srcdir)/src/calloutd.c -- \ + $(top_srcdir)/src/calloutd.c $(top_srcdir)/src/srvcfg.c -- \ $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ $(info_TEXINFOS) diff --git a/src/calloutd.c b/src/calloutd.c index 6d51ed68..d82f936a 100644 --- a/src/calloutd.c +++ b/src/calloutd.c @@ -76,7 +76,7 @@ parse_opt(int key, char *arg, struct argp_state *state) struct mu_cfg_param callout_cfg_param[] = { - { ".pm:server", mu_cfg_section, NULL, 0, NULL, NULL }, + { ".mfd:server", mu_cfg_section, NULL, 0, NULL, NULL }, { NULL } }; @@ -874,7 +874,7 @@ cb_relayed_domain_file(void *data, mu_config_value_t *val) struct mu_cfg_param mf_cfg_param[] = { - { ".pm:server", mu_cfg_section, NULL, 0, NULL, NULL }, + { ".mfd:server", mu_cfg_section, NULL, 0, NULL, NULL }, { "stack-trace", mu_cfg_bool, &stack_trace_option, 0, NULL, N_("Dump stack traces on runtime errors.") }, diff --git a/src/srvcfg.c b/src/srvcfg.c index 7ca3c764..43689c6c 100644 --- a/src/srvcfg.c +++ b/src/srvcfg.c @@ -809,15 +809,15 @@ mf_srvcfg_init(const char *progname, const char *label) setdefpidfilename(progname); mf_optcache_add(srv_option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC); - mu_gocs_register(".pm:server", srvcfg_gocs_init); - if (mu_register_argp_capa(".pm:server", &_srv_argp_child)) { + mu_gocs_register(".mfd:server", srvcfg_gocs_init); + if (mu_register_argp_capa(".mfd:server", &_srv_argp_child)) { mu_error(_("INTERNAL ERROR: " "cannot register argp capability `%s'"), - "pm:server"); + "mfd:server"); abort (); } - if (mu_create_canned_section (".pm:server", §ion) == 0) { + if (mu_create_canned_section (".mfd:server", §ion) == 0) { mu_cfg_section_add_params (section, srv_cfg_param); } } |