summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/Makefile.am8
-rw-r--r--src/calloutd.c2
-rw-r--r--src/main.c2
-rw-r--r--src/srvcfg.c8
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9dd98a0..ed48bcb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -54,5 +54,5 @@ check-mailfromd-options:
54 @check-docs.sh "mailfromd options" \ 54 @check-docs.sh "mailfromd options" \
55 '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ 55 '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
56 's/@opindex *\([^@,]*\), --.*mailfromd option.*/\1/p' \ 56 's/@opindex *\([^@,]*\), --.*mailfromd option.*/\1/p' \
57 $(top_srcdir)/src/main.c -- \ 57 $(top_srcdir)/src/main.c $(top_srcdir)/src/srvcfg.c -- \
58 $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ 58 $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
@@ -62,5 +62,5 @@ check-calloutd-options:
62 @check-docs.sh "calloutd options" \ 62 @check-docs.sh "calloutd options" \
63 '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \ 63 '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
64 's/@opindex *\([^@,]*\), --.*calloutd option.*/\1/p' \ 64 's/@opindex *\([^@,]*\), --.*calloutd option.*/\1/p' \
65 $(top_srcdir)/src/calloutd.c -- \ 65 $(top_srcdir)/src/calloutd.c $(top_srcdir)/src/srvcfg.c -- \
66 $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ 66 $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
diff --git a/src/calloutd.c b/src/calloutd.c
index 6d51ed6..d82f936 100644
--- a/src/calloutd.c
+++ b/src/calloutd.c
@@ -78,3 +78,3 @@ parse_opt(int key, char *arg, struct argp_state *state)
78struct mu_cfg_param callout_cfg_param[] = { 78struct mu_cfg_param callout_cfg_param[] = {
79 { ".pm:server", mu_cfg_section, NULL, 0, NULL, NULL }, 79 { ".mfd:server", mu_cfg_section, NULL, 0, NULL, NULL },
80 { NULL } 80 { NULL }
diff --git a/src/main.c b/src/main.c
index dd542eb..184b330 100644
--- a/src/main.c
+++ b/src/main.c
@@ -876,3 +876,3 @@ cb_relayed_domain_file(void *data, mu_config_value_t *val)
876struct mu_cfg_param mf_cfg_param[] = { 876struct mu_cfg_param mf_cfg_param[] = {
877 { ".pm:server", mu_cfg_section, NULL, 0, NULL, NULL }, 877 { ".mfd:server", mu_cfg_section, NULL, 0, NULL, NULL },
878 { "stack-trace", mu_cfg_bool, &stack_trace_option, 0, NULL, 878 { "stack-trace", mu_cfg_bool, &stack_trace_option, 0, NULL,
diff --git a/src/srvcfg.c b/src/srvcfg.c
index 7ca3c76..43689c6 100644
--- a/src/srvcfg.c
+++ b/src/srvcfg.c
@@ -811,7 +811,7 @@ mf_srvcfg_init(const char *progname, const char *label)
811 mf_optcache_add(srv_option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC); 811 mf_optcache_add(srv_option_cache, 0, MF_OCF_NULL|MF_OCF_STATIC);
812 mu_gocs_register(".pm:server", srvcfg_gocs_init); 812 mu_gocs_register(".mfd:server", srvcfg_gocs_init);
813 if (mu_register_argp_capa(".pm:server", &_srv_argp_child)) { 813 if (mu_register_argp_capa(".mfd:server", &_srv_argp_child)) {
814 mu_error(_("INTERNAL ERROR: " 814 mu_error(_("INTERNAL ERROR: "
815 "cannot register argp capability `%s'"), 815 "cannot register argp capability `%s'"),
816 "pm:server"); 816 "mfd:server");
817 abort (); 817 abort ();
@@ -819,3 +819,3 @@ mf_srvcfg_init(const char *progname, const char *label)
819 819
820 if (mu_create_canned_section (".pm:server", &section) == 0) { 820 if (mu_create_canned_section (".mfd:server", &section) == 0) {
821 mu_cfg_section_add_params (section, srv_cfg_param); 821 mu_cfg_section_add_params (section, srv_cfg_param);

Return to:

Send suggestions and report system problems to the System administrator.