From owner-p4-projects@FreeBSD.ORG  Sun Apr 15 18:14:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F3E9916A406; Sun, 15 Apr 2007 18:14:28 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B27E316A403
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:14:28 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id A371A13C448
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:14:28 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l3FIESmu086865
	for <perforce@freebsd.org>; Sun, 15 Apr 2007 18:14:28 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l3FIES9Y086862
	for perforce@freebsd.org; Sun, 15 Apr 2007 18:14:28 GMT
	(envelope-from csjp@freebsd.org)
Date: Sun, 15 Apr 2007 18:14:28 GMT
Message-Id: <200704151814.l3FIES9Y086862@repoman.freebsd.org>
X-Authentication-Warning: repoman.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>
Cc: 
Subject: PERFORCE change 118190 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
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: Sun, 15 Apr 2007 18:14:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=118190

Change 118190 by csjp@csjp_xor on 2007/04/15 18:14:20

	Teach audit_submit about getaudit_addr()

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#23 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#24 $
  */
 
 #ifdef __APPLE__
@@ -66,8 +66,9 @@
 	long acond;
 	va_list ap;
 	pid_t pid;
-	int error, afd;
+	int error, afd, subj_ex;
 	struct auditinfo ai;
+	struct auditinfo_addr aia;
 
 	if (auditon(A_GETCOND, &acond, sizeof(acond)) < 0) {
 		/*
@@ -84,6 +85,7 @@
 	}
 	if (acond == AUC_NOAUDIT)
 		return (0);
+	/* XXXCSJP we should be doing a pre-select here */
 	afd = au_open();
 	if (afd < 0) {
 		error = errno;
@@ -92,7 +94,20 @@
 		errno = error;
 		return (-1);
 	}
-	if (getaudit(&ai) < 0) {
+	/*
+	 * Some operating systems do not have getaudit_addr(2) implemented
+	 * yet.  So we try to use getaudit(2) first, if the subject is
+	 * using IPv6, then we will have to try getaudit_addr(2).  Failing
+	 * this, we return error.
+	 */
+	subj_ex = 0;
+	error = getaudit(&ai);
+	if (error < 0 && errno == E2BIG) {
+		error = getaudit_addr(&aia, sizeof(aia));
+		if (error == 0)
+			subj_ex = 1;
+	}
+	if (error < 0) {
 		error = errno;
 		syslog(LOG_AUTH | LOG_ERR, "audit: getaudit failed: %s",
 		    strerror(errno));
@@ -100,8 +115,12 @@
 		return (-1);
 	}
 	pid = getpid();
-	token = au_to_subject32(auid, geteuid(), getegid(),
-	    getuid(), getgid(), pid, pid, &ai.ai_termid);
+	if (subj_ex == 0)
+		token = au_to_subject32(auid, geteuid(), getegid(),
+		    getuid(), getgid(), pid, pid, &ai.ai_termid);
+	else
+		token = au_to_subject_ex(auid, geteuid(), getegid(),
+		    getuid(), getgid(), pid, pid, &aia.ai_termid);
 	if (token == NULL) {
 		syslog(LOG_AUTH | LOG_ERR,
 		    "audit: unable to build subject token");