diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-10-29 21:51:00 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-10-29 21:51:00 +0300 |
commit | 67ef8ed97b4192faa7b09bfa4fc899587f252f6d (patch) | |
tree | d2e2355196947c31b6299a9a7487f3b3e71ad6d1 | |
parent | 8a851aaa1382d188ca2968e7bbd813e99507c4ff (diff) | |
download | mailfromd-67ef8ed97b4192faa7b09bfa4fc899587f252f6d.tar.gz mailfromd-67ef8ed97b4192faa7b09bfa4fc899587f252f6d.tar.bz2 |
Minor fixes
-rw-r--r-- | lib/dbcfg.c | 3 | ||||
-rw-r--r-- | pmult/pmult.c | 14 | ||||
-rw-r--r-- | src/calloutd.c | 5 | ||||
-rw-r--r-- | src/main.c | 2 | ||||
-rw-r--r-- | src/mfdbtool.c | 1 | ||||
-rw-r--r-- | src/srvcfg.c | 14 |
6 files changed, 20 insertions, 19 deletions
diff --git a/lib/dbcfg.c b/lib/dbcfg.c index 60a46fd2..ce2644c0 100644 --- a/lib/dbcfg.c +++ b/lib/dbcfg.c @@ -80,13 +80,14 @@ cb_database_file(void *data, mu_config_value_t *arg) return 0; } struct mu_cfg_param database_section_param[] = { { "file", mu_cfg_callback, NULL, offsetof(struct db_format, dbname), cb_database_file, - N_("Name of the database file") }, + N_("Name of the database file"), + N_("name: string") }, { "enable", mu_c_bool, NULL, offsetof(struct db_format, enabled), NULL, N_("Enable or disable the database") }, { "expire-interval", mu_cfg_callback, NULL, offsetof(struct db_format, expire_interval), cb_db_expire_interval, N_("Set database record expiration interval"), N_("arg: interval") }, diff --git a/pmult/pmult.c b/pmult/pmult.c index 77ec1ede..a081376d 100644 --- a/pmult/pmult.c +++ b/pmult/pmult.c @@ -398,27 +398,27 @@ _cb_log_level (void *data, mu_config_value_t *arg) struct mu_cfg_param client_cfg_param[] = { { "type", mu_cfg_callback, NULL, 0, _cb_client_type, N_("Set remote milter type. Only `milter' is understood so far."), /* TRANSLATORS: 'milter' and 'pmilter' are keywords, do not translate them. */ - N_("{milter [version: number]|pmilter}") }, + N_("arg: milter [version: number]|pmilter") }, { "url", mu_c_string, NULL, mu_offsetof(struct pmult_client, url), NULL, N_("Set remote client URL.") }, { "write-timeout", mu_cfg_callback, NULL, 0, _cb_write_timeout, N_("Set write timeout."), - N_("time") }, + N_("arg: interval") }, { "read-timeout", mu_cfg_callback, NULL, 0, _cb_read_timeout, N_("Set read timeout."), - N_("time") }, + N_("arg: interval") }, { "eom-timeout", mu_cfg_callback, NULL, 0, _cb_eom_timeout, N_("Set timeout for EOM."), - N_("time") }, + N_("arg: interval") }, { "connect-timeout", mu_cfg_callback, NULL, 0, _cb_connect_timeout, N_("Set connect timeout."), - N_("time") }, + N_("arg: interval") }, { "log-level", mu_cfg_callback, NULL, 0, _cb_log_level, N_("Set log verbosity level. Arg is a list of items separated by commas " "or whitespace. Each item is a log level optionally prefixed with `!' " "to indicate `any level except this', or '<', meaning `all levels up " "to and including this'. Log levels in order of increasing priority " "are: proto, debug, info, warn, err, fatal."), @@ -654,13 +654,13 @@ request_auth_macros () macronames[PM_SMST_MAIL][i] = NULL; } struct mu_cfg_param pmult_cfg_param[] = { { "listen", mu_cfg_callback, &portspec, 0, _cb_portspec, N_("Listen for milter requests on the given URL."), - N_("url") }, + N_("url: string") }, { "max-threads-soft", mu_c_uint, &max_threads_soft, 0, NULL, N_("Maximum number of threads (soft limit).") }, { "max-threads-hard", mu_c_uint, &max_threads_hard, 0, NULL, N_("Maximum number of threads (hard limit).") }, { "max-pmilter-fd", mu_c_uint, &max_pmilter_fd, 0, NULL, N_("Maximum number of file descriptors pmilter is allowed to open") }, @@ -2242,13 +2242,13 @@ alloc_die_func () mu_error ("not enough memory"); abort (); } struct mu_cli_setup cli = { .optv = options, - .cfg = client_cfg_param, + .cfg = pmult_cfg_param, .prog_doc = prog_doc, }; int main (int argc, char **argv) { diff --git a/src/calloutd.c b/src/calloutd.c index 4ad4103f..65e0b7b4 100644 --- a/src/calloutd.c +++ b/src/calloutd.c @@ -49,17 +49,18 @@ const char *program_version = "calloutd (" PACKAGE_STRING ")"; static char prog_doc[] = N_("calloutd -- a call out server"); struct mu_cfg_param callout_cfg_param[] = { { ".mfd:server", mu_cfg_section, NULL, 0, NULL, NULL }, { "lock-retry-count", mu_cfg_callback, NULL, 0, config_cb_lock_retry_count, - N_("Retry acquiring DBM file lock this number of times.") }, + N_("Retry acquiring DBM file lock this number of times."), + N_("arg: number") }, { "lock-retry-timeout", mu_cfg_callback, NULL, 0, config_cb_lock_retry_timeout, N_("Set the time span between the two DBM locking attempts."), - N_("time") }, + N_("time: interval") }, { NULL } }; @@ -864,13 +864,13 @@ struct mu_cfg_param mf_cfg_param[] = { { "lock-retry-count", mu_cfg_callback, NULL, 0, config_cb_lock_retry_count, N_("Retry acquiring DBM file lock this number of times.") }, { "lock-retry-timeout", mu_cfg_callback, NULL, 0, config_cb_lock_retry_timeout, N_("Set the time span between the two DBM locking attempts."), - N_("time") }, + N_("time: interval") }, { "max-match-mx", mu_c_size, &max_match_mx, 0, NULL, N_("Maximum number of MXs used by MFL \"mx match\" operation.") }, { "runtime", mu_cfg_section, NULL }, diff --git a/src/mfdbtool.c b/src/mfdbtool.c index ab32a57c..03649f0b 100644 --- a/src/mfdbtool.c +++ b/src/mfdbtool.c @@ -328,13 +328,12 @@ struct mu_cfg_param mfdbtool_cfg_param[] = { N_("time: interval") }, { NULL } }; static char *capa[] = { - "common", "debug", "locking", NULL }; struct mu_cli_setup cli = { diff --git a/src/srvcfg.c b/src/srvcfg.c index b6a8f92a..a0a84d20 100644 --- a/src/srvcfg.c +++ b/src/srvcfg.c @@ -414,46 +414,46 @@ cb_timeout(void *data, mu_config_value_t *arg) } struct mu_cfg_param smtp_timeout_section_param[] = { { "connection", mu_cfg_callback, NULL, smtp_timeout_connect * sizeof(time_t), cb_timeout, N_("Initial SMTP connection timeout."), - N_("time") }, + N_("time: interval") }, { "initial-response", mu_cfg_callback, NULL, smtp_timeout_initial * sizeof(time_t), cb_timeout, N_("Timeout for initial SMTP response."), - N_("time") }, + N_("time: interval") }, { "helo", mu_cfg_callback, NULL, smtp_timeout_helo * sizeof(time_t), cb_timeout, N_("Timeout for HELO response."), - N_("time") }, + N_("time: interval") }, { "mail", mu_cfg_callback, NULL, smtp_timeout_mail * sizeof(time_t), cb_timeout, N_("Timeout for MAIL response."), - N_("time") }, + N_("time: interval") }, { "rcpt", mu_cfg_callback, NULL, smtp_timeout_rcpt * sizeof(time_t), cb_timeout, N_("Timeout for RCPT response."), - N_("time") }, + N_("time: interval") }, { "rset", mu_cfg_callback, NULL, smtp_timeout_rset * sizeof(time_t), cb_timeout, N_("Timeout for RSET response."), - N_("time") }, + N_("time: interval") }, { "quit", mu_cfg_callback, NULL, smtp_timeout_quit * sizeof(time_t), cb_timeout, N_("Timeout for QUIT response."), - N_("time") }, + N_("time: interval") }, { NULL } }; static void smtp_timeout_cfg_init() { |