summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2011-03-13 15:25:21 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2011-03-13 15:25:21 (GMT)
commit59770a628d4b64b1d7c86400217e4ab84f13ef37 (patch) (side-by-side diff)
tree32338be92520d0f716bd0fe782c198598e1593e1
parent07ca8622ff6226c45b4ac321b38e5f6918f11603 (diff)
downloadmailfromd-59770a628d4b64b1d7c86400217e4ab84f13ef37.tar.gz
mailfromd-59770a628d4b64b1d7c86400217e4ab84f13ef37.tar.bz2
Rename .pm:server config section to .mfd:server. Fix check-docs.
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:
@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 - \
@@ -62,5 +62,5 @@ 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 - \
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)
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 }
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)
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,
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)
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 ();
@@ -819,3 +819,3 @@ mf_srvcfg_init(const char *progname, const char *label)
- if (mu_create_canned_section (".pm:server", &section) == 0) {
+ if (mu_create_canned_section (".mfd:server", &section) == 0) {
mu_cfg_section_add_params (section, srv_cfg_param);

Return to:

Send suggestions and report system problems to the System administrator.