jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 22:23:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

include: Ensure security/audit/audit.h gets staged properly.

Browse Source 
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/<name>.h. This ensures that we get the
correct audit.h stanged for security/audit/audit.h.

Reviewed by:	sjg
Obtained from:	Juniper Networks, Inc.
This commit is contained in:
Stephen J. Kiernan 2024-04-03 20:22:29 -04:00
parent 112783ebbc
commit 41956c13f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Makefile
View File

@ -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