diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-04-28 09:48:40 +0000 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2007-04-28 09:48:40 +0000 |
commit | 22bf9913a1831690504a0ff1c43c209c5f258cea (patch) | |
tree | a37de21a742386bdf4a4f9a1d585520aa9171149 /src/main.c | |
parent | b49ef04125f27858ffafd8be38f1e73d81fb1c27 (diff) | |
download | mailfromd-22bf9913a1831690504a0ff1c43c209c5f258cea.tar.gz mailfromd-22bf9913a1831690504a0ff1c43c209c5f258cea.tar.bz2 |
Bugfixes
git-svn-id: file:///svnroot/mailfromd/trunk@1389 7a8a7f39-df28-0410-adc6-e0d955640f24
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 22 |
1 files changed, 16 insertions, 6 deletions
@@ -802,13 +802,13 @@ enum mailfromd_option { OPTION_DUMP_LEX_TRACE, OPTION_DUMP_MACROS, OPTION_DUMP_TREE, OPTION_DUMP_XREF, OPTION_EXPIRE, OPTION_FOREGROUND, - OPTION_DEBUG_GACOPYZ, + OPTION_GACOPYZ_LOG, OPTION_IGNORE_FAILED_READS, OPTION_LINT, OPTION_LOG_TAG, OPTION_LIST, OPTION_LOCK_RETRY_COUNT, OPTION_LOCK_RETRY_TIMEOUT, @@ -955,14 +955,14 @@ static struct argp_option options[] = { N_("Dump parser tree"), GRP+1 }, { "dump-macros", OPTION_DUMP_MACROS, NULL, 0, N_("Show used Sendmail macros"), GRP+1 }, { "xref", OPTION_DUMP_XREF, NULL, 0, N_("Produce a cross-reference listing"), GRP+1 }, { "dump-xref", 0, NULL, OPTION_ALIAS, NULL, GRP+1 }, - { "gacopyz-debug", OPTION_DEBUG_GACOPYZ, NULL, 0, - N_("Milter protocol trace"), GRP+1 }, + { "gacopyz-log", OPTION_GACOPYZ_LOG, N_("LEVEL"), 0, + N_("Set Gacopyz log level"), GRP+1 }, { "stderr", 's', NULL, 0, N_("Log to stderr"), GRP+1 }, { "syslog", OPTION_SYSLOG, NULL, 0, N_("Log to syslog (default)"), GRP+1 }, { "log-tag", OPTION_LOG_TAG, N_("STRING"), 0, N_("Set the identifier used in syslog messages to STRING"), GRP+1 }, @@ -1198,15 +1198,21 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case OPTION_FOREGROUND: foreground = 1; break; - case OPTION_DEBUG_GACOPYZ: - smfi_setdbg(1); + case OPTION_GACOPYZ_LOG: + { + int lev = gacopyz_string_to_log_level(arg); + if (lev == -1) + argp_error(state, "%s: invalid Gacopyz log level", + arg); + smfi_setlogmask(SMI_LOG_FROM(lev)); break; + } case OPTION_LIST: need_config = 0; log_to_stderr = 1; mode = MAILFROMD_LIST; break; @@ -1256,13 +1262,17 @@ parse_opt (int key, char *arg, struct argp_state *state) do_trace = 1; break; case OPTION_TRACE_PROGRAM: enable_prog_trace(arg ? arg: "all"); break; - + + case ARGP_KEY_INIT: + smfi_setlogmask(SMI_LOG_FROM(SMI_LOG_WARN)); + break; + case ARGP_KEY_FINI: if (validate_options()) exit(EX_USAGE); if (!syslog_tag) syslog_tag = program_invocation_short_name; |