From owner-p4-projects@FreeBSD.ORG  Thu Jan 13 22:24:20 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 97E4A106566B; Thu, 13 Jan 2011 22:24:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5A4E61065672
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:24:20 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id 4794A8FC19
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:24:20 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p0DMOK1s041396
	for <perforce@freebsd.org>; Thu, 13 Jan 2011 22:24:20 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p0DMOKlm041393
	for perforce@freebsd.org; Thu, 13 Jan 2011 22:24:20 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 13 Jan 2011 22:24:20 GMT
Message-Id: <201101132224.p0DMOKlm041393@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 187782 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jan 2011 22:24:20 -0000

http://p4web.freebsd.org/@@187782?ac=10

Change 187782 by trasz@trasz_victim on 2011/01/13 22:23:52

	Fix rather obvious thinko in rule matching.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#4 edit

Differences ...

==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#4 (text+ko) ====

@@ -396,22 +396,26 @@
 
 		switch (filter->hr_subject_type) {
 		case RCTL_SUBJECT_TYPE_PROCESS:
-			if (filter->hr_subject.hs_proc !=
+			if (filter->hr_subject.hs_proc != NULL &&
+			    rule->hr_subject.hs_proc !=
 			    filter->hr_subject.hs_proc)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_USER:
-			if (filter->hr_subject.hs_uip !=
+			if (filter->hr_subject.hs_uip != NULL &&
+			    rule->hr_subject.hs_uip !=
 			    filter->hr_subject.hs_uip)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_LOGINCLASS:
-			if (filter->hr_subject.hs_loginclass !=
+			if (filter->hr_subject.hs_loginclass != NULL &&
+			    rule->hr_subject.hs_loginclass !=
 			    filter->hr_subject.hs_loginclass)
 				return (0);
 			break;
 		case RCTL_SUBJECT_TYPE_JAIL:
-			if (filter->hr_subject.hs_prison !=
+			if (filter->hr_subject.hs_prison != NULL &&
+			    rule->hr_subject.hs_prison !=
 			    filter->hr_subject.hs_prison)
 				return (0);
 			break;