From owner-p4-projects@FreeBSD.ORG  Fri Feb 25 16:51:10 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6AEF31065670; Fri, 25 Feb 2011 16:51:10 +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 2BED6106566B
	for <perforce@freebsd.org>; Fri, 25 Feb 2011 16:51:10 +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 1905B8FC0C
	for <perforce@freebsd.org>; Fri, 25 Feb 2011 16:51:10 +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 p1PGp9e2069103
	for <perforce@freebsd.org>; Fri, 25 Feb 2011 16:51:09 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p1PGp9bF069100
	for perforce@freebsd.org; Fri, 25 Feb 2011 16:51:09 GMT
	(envelope-from trasz@freebsd.org)
Date: Fri, 25 Feb 2011 16:51:09 GMT
Message-Id: <201102251651.p1PGp9bF069100@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 189148 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: Fri, 25 Feb 2011 16:51:10 -0000

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

Change 189148 by trasz@trasz_victim on 2011/02/25 16:50:50

	In "devctl" action, pass jail name, not jail id.

Affected files ...

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

Differences ...

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

@@ -326,9 +326,9 @@
 			rctl_rule_to_sbuf(&sb, rule);
 			sbuf_finish(&sb);
 			printf("rctl: rule \"%s\" matched by pid %d "
-			    "(%s), uid %d, jid %d\n", sbuf_data(&sb), p->p_pid,
-			    p->p_comm, p->p_ucred->cr_uid,
-			    p->p_ucred->cr_prison->pr_id);
+			    "(%s), uid %d, jail %s\n", sbuf_data(&sb),
+			    p->p_pid, p->p_comm, p->p_ucred->cr_uid,
+			    p->p_ucred->cr_prison->pr_name);
 			sbuf_delete(&sb);
 			free(buf, M_RCTL);
 			link->rrl_exceeded = 1;
@@ -345,8 +345,9 @@
 			sbuf_new(&sb, buf, RCTL_LOG_BUFSIZE, SBUF_FIXEDLEN);
 			sbuf_printf(&sb, "rule=");
 			rctl_rule_to_sbuf(&sb, rule);
-			sbuf_printf(&sb, " pid=%d ruid=%d jid=%d", p->p_pid,
-			    p->p_ucred->cr_ruid, p->p_ucred->cr_prison->pr_id);
+			sbuf_printf(&sb, " pid=%d ruid=%d jail=%s",
+			    p->p_pid, p->p_ucred->cr_ruid,
+			    p->p_ucred->cr_prison->pr_name);
 			sbuf_finish(&sb);
 			devctl_notify_f("RCTL", "rule", "matched",
 			    sbuf_data(&sb), M_NOWAIT);