diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-13 17:25:21 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2011-03-13 17:25:21 +0200 |
commit | 59770a628d4b64b1d7c86400217e4ab84f13ef37 (patch) | |
tree | 32338be92520d0f716bd0fe782c198598e1593e1 | |
parent | 07ca8622ff6226c45b4ac321b38e5f6918f11603 (diff) | |
download | mailfromd-59770a628d4b64b1d7c86400217e4ab84f13ef37.tar.gz mailfromd-59770a628d4b64b1d7c86400217e4ab84f13ef37.tar.bz2 |
Rename .pm:server config section to .mfd:server. Fix check-docs.
-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 | |||
52 | 52 | ||
53 | check-mailfromd-options: | 53 | 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 - \ |
59 | $(info_TEXINFOS) | 59 | $(info_TEXINFOS) |
60 | 60 | ||
61 | check-calloutd-options: | 61 | 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 - \ |
67 | $(info_TEXINFOS) | 67 | $(info_TEXINFOS) |
68 | 68 | ||
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) | |||
76 | 76 | ||
77 | 77 | ||
78 | struct mu_cfg_param callout_cfg_param[] = { | 78 | struct 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 } |
81 | }; | 81 | }; |
82 | 82 | ||
@@ -874,7 +874,7 @@ cb_relayed_domain_file(void *data, mu_config_value_t *val) | |||
874 | 874 | ||
875 | 875 | ||
876 | struct mu_cfg_param mf_cfg_param[] = { | 876 | struct 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, |
879 | N_("Dump stack traces on runtime errors.") }, | 879 | N_("Dump stack traces on runtime errors.") }, |
880 | 880 | ||
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) | |||
809 | setdefpidfilename(progname); | 809 | setdefpidfilename(progname); |
810 | 810 | ||
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 (); |
818 | } | 818 | } |
819 | 819 | ||
820 | if (mu_create_canned_section (".pm:server", §ion) == 0) { | 820 | if (mu_create_canned_section (".mfd:server", §ion) == 0) { |
821 | mu_cfg_section_add_params (section, srv_cfg_param); | 821 | mu_cfg_section_add_params (section, srv_cfg_param); |
822 | } | 822 | } |
823 | } | 823 | } |