PERFORCE change 189148 for review

[Edward Tomasz Napierala]

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

Change 189148 by trasz at 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);