From 41956c13f95004882e2080862e3158e820c8db33 Mon Sep 17 00:00:00 2001 From: "Stephen J. Kiernan" Date: Wed, 3 Apr 2024 20:22:29 -0400 Subject: [PATCH] include: Ensure security/audit/audit.h gets staged properly. There is a conflict between bsm/audit.h and security/audit/audit.h due to the way that staging is being set up using .PATH to point to the full directory and the leaf files being specified in the list. Due to this, the bsm/audit.h was getting staged as both bsm/audit.h and security/audit/audit.h since the sys/bsm directory is listed first in the .PATH list. Use sys/security in the .PATH instead of sys/security/audit and specify the audit header files as audit/.h. This ensures that we get the correct audit.h stanged for security/audit/audit.h. Reviewed by: sjg Obtained from: Juniper Networks, Inc. --- include/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/Makefile b/include/Makefile index d9f0951c94a0..d44c982d950c 100644 --- a/include/Makefile +++ b/include/Makefile @@ -96,10 +96,10 @@ BSM= audit.h \ BSMPACKAGE= libbsm BSMDIR= ${INCLUDEDIR}/bsm -.PATH: ${SRCTOP}/sys/security/audit -SECAUDIT= audit.h \ - audit_ioctl.h \ - audit_private.h +.PATH: ${SRCTOP}/sys/security +SECAUDIT= audit/audit.h \ + audit/audit_ioctl.h \ + audit/audit_private.h SECAUDITPACKAGE= libbsm SECAUDITDIR= ${INCLUDEDIR}/security/audit