From owner-p4-projects@FreeBSD.ORG  Sat Jan 14 19:25:58 2006
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 D22D816A422; Sat, 14 Jan 2006 19:25:57 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AC0EE16A41F
	for <perforce@freebsd.org>; Sat, 14 Jan 2006 19:25:57 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4D98843D45
	for <perforce@freebsd.org>; Sat, 14 Jan 2006 19:25:57 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k0EJPvq7098452
	for <perforce@freebsd.org>; Sat, 14 Jan 2006 19:25:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k0EJPvrl098449
	for perforce@freebsd.org; Sat, 14 Jan 2006 19:25:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 14 Jan 2006 19:25:57 GMT
Message-Id: <200601141925.k0EJPvrl098449@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 89690 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: Sat, 14 Jan 2006 19:25:58 -0000

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

Change 89690 by rwatson@rwatson_peppercorn on 2006/01/14 19:25:07

	If getauditflagsbin() fails in getfauditflags(), fail
	getfauditflags().

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#8 (text+ko) ====

@@ -257,9 +257,11 @@
 	lastmask->am_success = 0;
 	lastmask->am_failure = 0;
 
-	/* get the system mask */
-	if (getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0)
-		getauditflagsbin(auditstring, lastmask);
+	/* Get the system mask. */
+	if (getacflg(auditstring, MAX_AUDITSTRING_LEN) == 0) {
+		if (getauditflagsbin(auditstring, lastmask) != 0)
+			return (-1);
+	}
 
 	ADDMASK(lastmask, usremask);
 	SUBMASK(lastmask, usrdmask);