From owner-p4-projects@FreeBSD.ORG  Tue Jan  4 22:59:27 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D24B01065672; Tue,  4 Jan 2011 22:59:26 +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 93CF6106564A
	for <perforce@freebsd.org>; Tue,  4 Jan 2011 22:59:26 +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 667F28FC12
	for <perforce@freebsd.org>; Tue,  4 Jan 2011 22:59:26 +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 p04MxQjo073179
	for <perforce@freebsd.org>; Tue, 4 Jan 2011 22:59:26 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p04MxQtd073176
	for perforce@freebsd.org; Tue, 4 Jan 2011 22:59:26 GMT
	(envelope-from csjp@freebsd.org)
Date: Tue, 4 Jan 2011 22:59:26 GMT
Message-Id: <201101042259.p04MxQtd073176@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 187474 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: Tue, 04 Jan 2011 22:59:27 -0000

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

Change 187474 by csjp@csjp_hvm02 on 2011/01/04 22:58:21

	When using an audit trail file, include the name  of the trail.

Affected files ...

.. //depot/projects/trustedbsd/bsmtrace/bsm.c#5 edit
.. //depot/projects/trustedbsd/bsmtrace/log.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/bsmtrace/bsm.c#5 (text+ko) ====


==== //depot/projects/trustedbsd/bsmtrace/log.c#5 (text+ko) ====

@@ -50,19 +50,29 @@
 char *
 parse_bsm_generic(struct bsm_sequence *bs, struct bsm_record_data *br)
 {
-	char message[128];
+	char 	 message[128 + NAME_MAX];
+	char	*basename;
 	u_int subj;
 
+	if (strcmp(opts.aflag, "-") == 0)
+		basename = "stdin";
+	else {
+		basename = strrchr(opts.aflag, '/');
+		basename = (basename == NULL) ? opts.aflag : basename + 1;
+	}
+
 	if ((bs->bs_seq_flags & BSM_SEQUENCE_PARENT) != 0) {
 		subj = bsm_get_subj(bs, br);
 		bs->bs_first_match = br->br_sec;
 	} else
 		subj = bs->bs_subj.bs_dyn_subj;
+
 	(void) snprintf(message, sizeof(message),
 	    "%d.%d state machine: %s subject: auid %d "
-	    "completed: duration %d seconds priority: %d\n",
+	    "completed: duration %d seconds priority: %d "
+	    "source: %s\n",
 	    br->br_sec, br->br_usec, bs->bs_label,
-	    subj, br->br_sec - bs->bs_first_match, bs->bs_priority);
+	    subj, br->br_sec - bs->bs_first_match, bs->bs_priority, basename);
 	return (strdup(message));
 }
 
@@ -102,7 +112,14 @@
 	struct stat sb;
 	int fd, error;
 	struct bsm_state *bm;
+	char *src_basename;
 
+	if (strcmp(opts.aflag, "-") == 0)
+		src_basename = "stdin";
+	else {
+		src_basename = strrchr(opts.aflag, '/');
+		src_basename = (src_basename == NULL) ? opts.aflag : src_basename + 1;
+	}
 	(void) snprintf(dir, MAXPATHLEN,
 	    "%s/%s", lc->log_data.bsm_log_dir, bs->bs_label);
 	error = stat(dir, &sb);
@@ -124,10 +141,11 @@
 	 * each individual state.
 	 */
 	syslog(LOG_AUTH | LOG_NOTICE,
-	    "%u.%u sequence %s match evidence file: %s",
+	    "%u.%u sequence %s match evidence file: %s source: %s",
 	    br->br_sec, br->br_usec,
 	    bs->bs_label,
-	    path);
+	    path,
+	    src_basename);
 	if ((bs->bs_seq_flags & BSM_SEQUENCE_PARENT) != 0) {
 		if (write(fd, br->br_raw, br->br_raw_len) < 0)
 			bsmtrace_error(1, "write failed");