From owner-svn-src-stable@FreeBSD.ORG  Wed Oct 24 10:30:41 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6DF302F1;
 Wed, 24 Oct 2012 10:30:41 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 55C878FC08;
 Wed, 24 Oct 2012 10:30:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9OAUfvb095116;
 Wed, 24 Oct 2012 10:30:41 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9OAUfkQ095114;
 Wed, 24 Oct 2012 10:30:41 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201210241030.q9OAUfkQ095114@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 24 Oct 2012 10:30:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r241995 - stable/9/usr.sbin/bsnmpd/modules/snmp_hostres
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Oct 2012 10:30:41 -0000

Author: glebius
Date: Wed Oct 24 10:30:40 2012
New Revision: 241995
URL: http://svn.freebsd.org/changeset/base/241995

Log:
  Merge r240354 from head:
    Do not count kernel threads as processes for hrSystemProcesses OID.
  
    PR:           bin/160494
    Submitted by: Jeremy Chadwick <freebsd jdc.parodius.com>

Modified:
  stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
Directory Properties:
  stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/   (props changed)

Modified: stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
==============================================================================
--- stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c	Wed Oct 24 10:28:12 2012	(r241994)
+++ stable/9/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c	Wed Oct 24 10:30:40 2012	(r241995)
@@ -238,7 +238,7 @@ OS_getSystemProcesses(uint32_t *proc_cou
 	if (hr_kd == NULL)
 		return (SNMP_ERR_GENERR);
 
-	if (kvm_getprocs(hr_kd, KERN_PROC_ALL, 0, &pc) == NULL) {
+	if (kvm_getprocs(hr_kd, KERN_PROC_PROC, 0, &pc) == NULL) {
 		syslog(LOG_ERR, "kvm_getprocs failed: %m");
 		return (SNMP_ERR_GENERR);
 	}