diff options
| author | rwatson <rwatson@FreeBSD.org> | 2006-02-11 00:39:23 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2006-02-11 00:39:23 +0000 |
| commit | 0b2cf89651826909f5fdc3b98f24a31060a0f915 (patch) | |
| tree | 2466057676bf82de8285107aedb42f759416805f /contrib/openbsm/bsm | |
| parent | 4fae3f6a4aec0b2ccf88592624f71ae94d961ef8 (diff) | |
| download | FreeBSD-src-0b2cf89651826909f5fdc3b98f24a31060a0f915.zip FreeBSD-src-0b2cf89651826909f5fdc3b98f24a31060a0f915.tar.gz | |
CVS import 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
Diffstat (limited to 'contrib/openbsm/bsm')
| -rw-r--r-- | contrib/openbsm/bsm/libbsm.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/openbsm/bsm/libbsm.h b/contrib/openbsm/bsm/libbsm.h index baf9f14..09233c0 100644 --- a/contrib/openbsm/bsm/libbsm.h +++ b/contrib/openbsm/bsm/libbsm.h @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#16 $ */ #ifndef _LIBBSM_H_ @@ -44,11 +44,12 @@ #include <sys/cdefs.h> #include <sys/queue.h> +#include <stdint.h> /* Required for audit.h. */ + #include <bsm/audit.h> #include <bsm/audit_record.h> #include <stdio.h> -#include <stdint.h> #ifdef __APPLE__ #include <mach/mach.h> /* audit_token_t */ @@ -871,7 +872,7 @@ int au_get_state(void); __END_DECLS /* OpenSSH compatibility */ -#define cannot_audit(x) (!(au_get_state() == AUC_AUDITING)) +int cannot_audit(int); __BEGIN_DECLS /* |
