From owner-p4-projects@FreeBSD.ORG  Fri Jun  3 15:47:32 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0BCBE106566C; Fri,  3 Jun 2011 15:47:32 +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 C2841106564A
	for <perforce@freebsd.org>; Fri,  3 Jun 2011 15:47:31 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id B02E48FC15
	for <perforce@freebsd.org>; Fri,  3 Jun 2011 15:47:31 +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 p53FlVuk029642
	for <perforce@freebsd.org>; Fri, 3 Jun 2011 15:47:31 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p53FlVIx029639
	for perforce@freebsd.org; Fri, 3 Jun 2011 15:47:31 GMT
	(envelope-from csjp@freebsd.org)
Date: Fri, 3 Jun 2011 15:47:31 GMT
Message-Id: <201106031547.p53FlVIx029639@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 194159 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, 03 Jun 2011 15:47:32 -0000

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

Change 194159 by csjp@csjp_hvm02 on 2011/06/03 15:47:14

	- Increase the storage associated with trigger specification storage
	- Add support to use effective uid as trigger parameters
	
	Submitted by:	Eirik Øverby

Affected files ...

.. //depot/projects/trustedbsd/bsmtrace/deuce.h#7 edit
.. //depot/projects/trustedbsd/bsmtrace/trigger.c#3 edit
.. //depot/projects/trustedbsd/bsmtrace/trigger.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/bsmtrace/deuce.h#7 (text+ko) ====

@@ -105,7 +105,7 @@
 	int		 bm_status;
 	int		 bm_multiplier;
 	int		 bm_event_type;
-	char		 bm_trig[1024];
+	char		 bm_trig[8192];
 	TAILQ_ENTRY(bsm_state)	bm_glue;
 	caddr_t		 bm_raw;
 	int		 bm_raw_len;

==== //depot/projects/trustedbsd/bsmtrace/trigger.c#3 (text+ko) ====

@@ -35,6 +35,7 @@
 } exptab[] = {
 	{ "subject",	EXP_USER },
 	{ "object",	EXP_OBJECT },
+	{ "esubject",	EXP_EUSER },
 	{ NULL,		0 }
 };
 
@@ -78,6 +79,14 @@
 					(void) strlcpy(token, pw->pw_name,
 					    sizeof(token));
 				break;
+			case EXP_EUSER:
+				if ((pw = getpwuid(bd->br_euid)) == NULL)
+					(void) strlcpy(token, "non-attributable",
+					    sizeof(token));
+				else
+					(void) strlcpy(token, pw->pw_name,
+					    sizeof(token));
+				break;
 			case EXP_OBJECT:
 				if (bd->br_path != NULL)
 					(void) strlcpy(token, bd->br_path,

==== //depot/projects/trustedbsd/bsmtrace/trigger.h#2 (text+ko) ====

@@ -35,7 +35,8 @@
 enum {
 	EXP_NONE,
 	EXP_USER,
-	EXP_OBJECT
+	EXP_OBJECT,
+	EXP_EUSER
 };
 
 void	 bsm_run_trigger(struct bsm_record_data *, struct bsm_state *);