From owner-svn-src-all@FreeBSD.ORG  Sun Nov 30 19:58:03 2008
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD9F71065675;
	Sun, 30 Nov 2008 19:58:03 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9D0238FC17;
	Sun, 30 Nov 2008 19:58:03 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mAUJw3D9000326;
	Sun, 30 Nov 2008 19:58:03 GMT (envelope-from csjp@svn.freebsd.org)
Received: (from csjp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mAUJw3cq000325;
	Sun, 30 Nov 2008 19:58:03 GMT (envelope-from csjp@svn.freebsd.org)
Message-Id: <200811301958.mAUJw3cq000325@svn.freebsd.org>
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Sun, 30 Nov 2008 19:58:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r185484 - head/sys/security/audit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Nov 2008 19:58:03 -0000

Author: csjp
Date: Sun Nov 30 19:58:03 2008
New Revision: 185484
URL: http://svn.freebsd.org/changeset/base/185484

Log:
  Partially roll back a revision which changed the error code being returned
  by getaudit(2).  Some applications such has su, id will interpret E2BIG as
  requiring the use of getaudit_addr(2) to pull extended audit state (ip6)
  from the kernel.
  
  This change un-breaks the ABI when auditing has been activated on a system
  and the users are logged in via ip6.
  
  This is a RELENG_7_1 candidate.
  
  MFC after:	1 day
  Discussed with:	rwatson

Modified:
  head/sys/security/audit/audit_syscalls.c

Modified: head/sys/security/audit/audit_syscalls.c
==============================================================================
--- head/sys/security/audit/audit_syscalls.c	Sun Nov 30 19:30:31 2008	(r185483)
+++ head/sys/security/audit/audit_syscalls.c	Sun Nov 30 19:58:03 2008	(r185484)
@@ -510,7 +510,7 @@ getaudit(struct thread *td, struct getau
 	if (error)
 		return (error);
 	if (cred->cr_audit.ai_termid.at_type == AU_IPv6)
-		return (ERANGE);
+		return (E2BIG);
 	bzero(&ai, sizeof(ai));
 	ai.ai_auid = cred->cr_audit.ai_auid;
 	ai.ai_mask = cred->cr_audit.ai_mask;