Bugfixes

git-svn-id: file:///svnroot/mailfromd/trunk@1389 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 16 insertions, 6 deletions

diff --git a/src/main.c b/src/main.c
index 56aa2af2..d389ec46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -807,3 +807,3 @@ enum mailfromd_option {
 	OPTION_FOREGROUND,
-	OPTION_DEBUG_GACOPYZ,
+	OPTION_GACOPYZ_LOG,
 	OPTION_IGNORE_FAILED_READS,
@@ -960,4 +960,4 @@ static struct argp_option options[] = {
 	{ "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,
@@ -1203,5 +1203,11 @@ parse_opt (int key, char *arg, struct argp_state *state)
 
-	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;
+	}
 		
@@ -1261,3 +1267,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
 		break;
-		
+
+	case ARGP_KEY_INIT:
+		smfi_setlogmask(SMI_LOG_FROM(SMI_LOG_WARN));
+		break;
+			
 	case ARGP_KEY_FINI: