From owner-p4-projects@FreeBSD.ORG  Mon Sep 26 11:33:45 2005
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 7178616A421; Mon, 26 Sep 2005 11:33:45 +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 465B616A41F
	for <perforce@freebsd.org>; Mon, 26 Sep 2005 11:33:45 +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 10BD243D48
	for <perforce@freebsd.org>; Mon, 26 Sep 2005 11:33:45 +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 j8QBXiC9080644
	for <perforce@freebsd.org>; Mon, 26 Sep 2005 11:33:44 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 j8QBXiK3080641
	for perforce@freebsd.org; Mon, 26 Sep 2005 11:33:44 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Mon, 26 Sep 2005 11:33:44 GMT
Message-Id: <200509261133.j8QBXiK3080641@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 84286 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: Mon, 26 Sep 2005 11:33:46 -0000

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

Change 84286 by rwatson@rwatson_zoo on 2005/09/26 11:33:34

	For now, assume that if auditon() returns ENOSYS, then audit is not
	configured.

Affected files ...

.. //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/usr.bin/login/login.c#5 (text+ko) ====

@@ -820,6 +820,8 @@
 
 	/* If we are not auditing, don't cut an audit record; just return */
  	if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) {
+		if (errno == ENOSYS)
+			return;
 		fprintf(stderr, "login: Could not determine audit condition\n");
 		exit(1);
 	}
@@ -890,6 +892,8 @@
 
 	/* If we are not auditing, don't cut an audit record; just return */
  	if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) {
+		if (errno == ENOSYS)
+			return;
 		fprintf(stderr, "login: Could not determine audit condition\n");
 		exit(1);
 	}