Skip to content

Commit

Permalink
include: Ensure security/audit/audit.h gets staged properly.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Stephen J. Kiernan authored and Stephen J. Kiernan committed Apr 4, 2024
1 parent 112783e commit 41956c1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 41956c1

Please sign in to comment.