From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 11 10:50:24 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B461C16A403 for ; Mon, 11 Dec 2006 10:50:24 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB62743C9D for ; Mon, 11 Dec 2006 10:49:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBBAoNNG020571 for ; Mon, 11 Dec 2006 10:50:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBBAoN0t020565; Mon, 11 Dec 2006 10:50:23 GMT (envelope-from gnats) Resent-Date: Mon, 11 Dec 2006 10:50:23 GMT Resent-Message-Id: <200612111050.kBBAoN0t020565@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Denis Eremenko " Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CF71616A4FE for ; Mon, 11 Dec 2006 10:45:23 +0000 (UTC) (envelope-from moonshade@pnhz.kz) Received: from relay.pnhz.kz (relay.pnhz.kz [212.154.198.217]) by mx1.FreeBSD.org (Postfix) with ESMTP id EBECE43CEC for ; Mon, 11 Dec 2006 10:43:41 +0000 (GMT) (envelope-from moonshade@pnhz.kz) Received: from abyss.pnhz.kz (abyss.pnhz.kz [192.168.121.40]) by relay.pnhz.kz with ESMTP id kBBAinBq055807 for ; Mon, 11 Dec 2006 16:44:50 +0600 (ALMT) (envelope-from moonshade@pnhz.kz) Message-Id: <1165833888.76153@abyss.pnhz.kz> Date: Mon, 11 Dec 2006 16:44:48 +0600 From: "Denis Eremenko " To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.7 Cc: Subject: ports/106602: mail/milter-regex always do syslog(LOG_DEBUG, ...) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2006 10:50:24 -0000 >Number: 106602 >Category: ports >Synopsis: mail/milter-regex always do syslog(LOG_DEBUG, ...) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 11 10:50:03 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Denis Eremenko >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD 6.2-PRERELEASE #0: Tue Dec 5 14:17:41 ALMT 2006 root@abyss.pnhz.kz:/usr/obj/data/os/FreeBSD/src/6/src/sys/ABYSS-6 >Description: mail/milter-regex always do syslog(LOG_DEBUG, ...) spamming /var/log/debug.log with each message passing through. It should be optional. >How-To-Repeat: just use it >Fix: --- patch-no-log_debug begins here --- --- milter-regex.c.orig Mon Dec 11 15:42:26 2006 +++ milter-regex.c Mon Dec 11 15:52:23 2006 @@ -57,6 +57,7 @@ static const char *rule_file_name = "/etc/milter-regex.conf"; static int debug = 0; +static int verbose = 0; struct context { struct ruleset *rs; @@ -520,6 +521,9 @@ va_list ap; char msg[8192]; + if (!verbose) + return; + va_start(ap, fmt); if (context != NULL) snprintf(msg, sizeof(msg), "%s: ", context->host_addr); @@ -563,13 +567,16 @@ tzset(); openlog("milter-regex", LOG_PID | LOG_NDELAY, LOG_DAEMON); - while ((ch = getopt(argc, argv, "c:dp:u:")) != -1) { + while ((ch = getopt(argc, argv, "c:dvp:u:")) != -1) { switch (ch) { case 'c': rule_file_name = optarg; break; case 'd': - debug = 1; + debug = verbose = 1; + break; + case 'v': + verbose = 1; break; case 'p': oconn = optarg; --- milter-regex.8.orig Sat Mar 13 23:21:23 2004 +++ milter-regex.8 Mon Dec 11 15:58:25 2006 @@ -51,7 +51,9 @@ .Bl -tag -width "-c config" .It Fl d Don't detach from controlling terminal and produce verbose debug -output on stdout. +output on stdout. Implies -v. +.It Fl v +Do verbose LOG_DEBUG level logging. .It Fl c Ar config Use the specified configuration file instead of the default, /etc/milter-regex.conf. --- patch-no-log_debug ends here --- >Release-Note: >Audit-Trail: >Unformatted: