From owner-svn-src-all@FreeBSD.ORG  Sat Apr 23 05:29:59 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 720BF1065670;
	Sat, 23 Apr 2011 05:29:59 +0000 (UTC) (envelope-from ru@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 601D58FC08;
	Sat, 23 Apr 2011 05:29:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3N5Txpx073364;
	Sat, 23 Apr 2011 05:29:59 GMT (envelope-from ru@svn.freebsd.org)
Received: (from ru@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3N5TxjM073362;
	Sat, 23 Apr 2011 05:29:59 GMT (envelope-from ru@svn.freebsd.org)
Message-Id: <201104230529.p3N5TxjM073362@svn.freebsd.org>
From: Ruslan Ermilov <ru@FreeBSD.org>
Date: Sat, 23 Apr 2011 05:29:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220964 - stable/8/contrib/bsnmp/snmpd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 23 Apr 2011 05:29:59 -0000

Author: ru
Date: Sat Apr 23 05:29:59 2011
New Revision: 220964
URL: http://svn.freebsd.org/changeset/base/220964

Log:
  MFC r220882:
  
  Don't clog syslog up with "inet_ntop(): Address family not supported
  by protocol family" when processing requests received from the UNIX
  domain socket.

Modified:
  stable/8/contrib/bsnmp/snmpd/main.c
Directory Properties:
  stable/8/contrib/bsnmp/   (props changed)

Modified: stable/8/contrib/bsnmp/snmpd/main.c
==============================================================================
--- stable/8/contrib/bsnmp/snmpd/main.c	Sat Apr 23 05:24:17 2011	(r220963)
+++ stable/8/contrib/bsnmp/snmpd/main.c	Sat Apr 23 05:29:59 2011	(r220964)
@@ -909,7 +909,8 @@ snmpd_input(struct port_input *pi, struc
 	/*
 	 * In case of AF_INET{6} peer, do hosts_access(5) check.
 	 */
-	if (inet_ntop(pi->peer->sa_family,
+	if (pi->peer->sa_family != AF_LOCAL &&
+	    inet_ntop(pi->peer->sa_family,
 	    &((const struct sockaddr_in *)(const void *)pi->peer)->sin_addr,
 	    client, sizeof(client)) != NULL) {
 		request_set(&req, RQ_CLIENT_ADDR, client, 0);
@@ -918,7 +919,7 @@ snmpd_input(struct port_input *pi, struc
 			    eval_client(&req));
 			return (-1);
 		}
-	} else
+	} else if (pi->peer->sa_family != AF_LOCAL)
 		syslog(LOG_ERR, "inet_ntop(): %m");
 #endif