aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/openbsm/libbsm/bsm_wrappers.c
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2006-02-11 00:39:23 +0000
committerRobert Watson <rwatson@FreeBSD.org>2006-02-11 00:39:23 +0000
commitf4e380b0ce61bf1224efd31d7261e40f3a423af9 (patch)
tree2466057676bf82de8285107aedb42f759416805f /contrib/openbsm/libbsm/bsm_wrappers.c
parent23bf6e2091d6f4eea4818bb19a867eb620f04d13 (diff)
downloadsrc-f4e380b0ce61bf1224efd31d7261e40f3a423af9.tar.gz
src-f4e380b0ce61bf1224efd31d7261e40f3a423af9.zip
CVS import OpenBSM 1.0 alpha 4:vendor/openbsm/1.0-ALPHA-4
- Remove "audit" user example from audit_user, as it's not present on most systems. - Add cannot_audit() function non-Darwin systems that wraps auditon(); required by OpenSSH BSM support. Convert Darwin cannot_audit() into a function rather than a macro. - Library build fixed on Darwin following include file tweaks. The native Darwin sys/audit.h conflicts with bsm/audit.h due to duplicate types, so for now we force bsm_wrappers.c to not perform a nested include of sys/audit.h. Obtained from: TrustedBSD Project
Notes
Notes: svn path=/vendor/openbsm/dist/; revision=155518 svn path=/vendor/openbsm/1.0-ALPHA-4/; revision=155520; tag=vendor/openbsm/1.0-ALPHA-4
Diffstat (limited to 'contrib/openbsm/libbsm/bsm_wrappers.c')
-rw-r--r--contrib/openbsm/libbsm/bsm_wrappers.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/openbsm/libbsm/bsm_wrappers.c b/contrib/openbsm/libbsm/bsm_wrappers.c
index e7600e7f5ee2..492963e88ab3 100644
--- a/contrib/openbsm/libbsm/bsm_wrappers.c
+++ b/contrib/openbsm/libbsm/bsm_wrappers.c
@@ -26,9 +26,13 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#16 $
*/
+#ifdef __APPLE__
+#define _SYS_AUDIT_H /* Prevent include of sys/audit.h. */
+#endif
+
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>