From owner-svn-src-stable-10@freebsd.org  Fri May 13 09:14:44 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 57C34B39BBA;
 Fri, 13 May 2016 09:14:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 299981D84;
 Fri, 13 May 2016 09:14:44 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4D9EhiO078465;
 Fri, 13 May 2016 09:14:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4D9EhoA078464;
 Fri, 13 May 2016 09:14:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605130914.u4D9EhoA078464@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 13 May 2016 09:14:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r299638 - stable/10/contrib/bsnmp/snmp_mibII
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 09:14:44 -0000

Author: ngie
Date: Fri May 13 09:14:43 2016
New Revision: 299638
URL: https://svnweb.freebsd.org/changeset/base/299638

Log:
  MFC r298462:
  
  Return `ret` in op_ifentry(..) to mute a -Wunused-but-set-variable warning
  
  This will also now detect error conditions with
  value->var.subs[sub - 1] == LEAF_ifPhysAddress where `string_get(..)`
  could fail if iifp->physaddr and/or iifp->physaddrlen were deemed
  invalid.
  
  CID: 1006551

Modified:
  stable/10/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/bsnmp/snmp_mibII/mibII_interfaces.c
==============================================================================
--- stable/10/contrib/bsnmp/snmp_mibII/mibII_interfaces.c	Fri May 13 09:11:41 2016	(r299637)
+++ stable/10/contrib/bsnmp/snmp_mibII/mibII_interfaces.c	Fri May 13 09:14:43 2016	(r299638)
@@ -356,7 +356,7 @@ op_ifentry(struct snmp_context *ctx, str
 		value->v.oid = ifp->spec_oid;
 		break;
 	}
-	return (SNMP_ERR_NOERROR);
+	return (ret);
 }
 
 /*