From owner-svn-src-head@freebsd.org  Fri Mar 31 14:13:14 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4ED9DD27641;
 Fri, 31 Mar 2017 14:13:14 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1F0E0E66;
 Fri, 31 Mar 2017 14:13:14 +0000 (UTC)
 (envelope-from rwatson@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2VEDDvk086573;
 Fri, 31 Mar 2017 14:13:13 GMT (envelope-from rwatson@FreeBSD.org)
Received: (from rwatson@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2VEDD1I086572;
 Fri, 31 Mar 2017 14:13:13 GMT (envelope-from rwatson@FreeBSD.org)
Message-Id: <201703311413.v2VEDD1I086572@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: rwatson set sender to
 rwatson@FreeBSD.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Date: Fri, 31 Mar 2017 14:13:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316333 - head/sys/security/audit
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Mar 2017 14:13:14 -0000

Author: rwatson
Date: Fri Mar 31 14:13:13 2017
New Revision: 316333
URL: https://svnweb.freebsd.org/changeset/base/316333

Log:
  Correct macro names and signatures for !AUDIT versions of canonical
  path auditing.
  
  Obtained from:	TrustedBSD Project
  MFC after:	3 weeks
  Sponsored by:	DARPA, AFRL

Modified:
  head/sys/security/audit/audit.h

Modified: head/sys/security/audit/audit.h
==============================================================================
--- head/sys/security/audit/audit.h	Fri Mar 31 13:43:00 2017	(r316332)
+++ head/sys/security/audit/audit.h	Fri Mar 31 14:13:13 2017	(r316333)
@@ -431,9 +431,9 @@ void	 audit_thread_free(struct thread *t
 #define	AUDIT_ARG_TEXT(text)
 #define	AUDIT_ARG_UID(uid)
 #define	AUDIT_ARG_UPATH1(td, dirfd, upath)
-#define	AUDIT_ARG_UPATH1_NONCANON(td, upath)
+#define	AUDIT_ARG_UPATH1_CANON(upath)
 #define	AUDIT_ARG_UPATH2(td, dirfd, upath)
-#define	AUDIT_ARG_UPATH2_NONCANON(td, upath)
+#define	AUDIT_ARG_UPATH2_CANON(upath)
 #define	AUDIT_ARG_VALUE(value)
 #define	AUDIT_ARG_VNODE1(vp)
 #define	AUDIT_ARG_VNODE2(vp)