From e424220a0e3a21994020ef2d92c5e1d31d0b952c Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 20 Sep 2012 13:00:09 +0100
Subject: [PATCH] Convert HAVE_AUDIT to WITH_AUDIT
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
configure.ac | 4 ++--
src/util/viraudit.c | 14 +++++++-------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index ffe0f66e39..e4778f9061 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1258,13 +1258,13 @@ if test "$with_audit" != "no" ; then
if test "$with_audit" = "yes" ; then
AUDIT_LIBS="$AUDIT_LIBS -laudit"
- AC_DEFINE_UNQUOTED([HAVE_AUDIT], 1, [whether libaudit is available])
+ AC_DEFINE_UNQUOTED([WITH_AUDIT], 1, [whether libaudit is available])
fi
CFLAGS="$old_cflags"
LIBS="$old_libs"
fi
-AM_CONDITIONAL([HAVE_AUDIT], [test "$with_audit" = "yes"])
+AM_CONDITIONAL([WITH_AUDIT], [test "$with_audit" = "yes"])
AC_SUBST([AUDIT_CFLAGS])
AC_SUBST([AUDIT_LIBS])
diff --git a/src/util/viraudit.c b/src/util/viraudit.c
index 04ac323e29..0f4bb4f4a8 100644
--- a/src/util/viraudit.c
+++ b/src/util/viraudit.c
@@ -21,7 +21,7 @@
#include <config.h>
-#ifdef HAVE_AUDIT
+#ifdef WITH_AUDIT
# include <libaudit.h>
#endif
#include <stdio.h>
@@ -48,14 +48,14 @@
#define VIR_FROM_THIS VIR_FROM_AUDIT
-#if HAVE_AUDIT
+#if WITH_AUDIT
static int auditfd = -1;
#endif
static int auditlog = 0;
int virAuditOpen(void)
{
-#if HAVE_AUDIT
+#if WITH_AUDIT
if ((auditfd = audit_open()) < 0) {
virReportSystemError(errno, "%s", _("Unable to initialize audit layer"));
return -1;
@@ -87,7 +87,7 @@ void virAuditSend(const char *filename,
/* Duplicate later checks, to short circuit & avoid printf overhead
* when nothing is enabled */
-#if HAVE_AUDIT
+#if WITH_AUDIT
if (!auditlog && auditfd < 0)
return;
#else
@@ -113,7 +113,7 @@ void virAuditSend(const char *filename,
NULL, "success=no %s", str);
}
-#if HAVE_AUDIT
+#if WITH_AUDIT
if (auditfd < 0) {
VIR_FREE(str);
return;
@@ -141,14 +141,14 @@ void virAuditSend(const char *filename,
void virAuditClose(void)
{
-#if HAVE_AUDIT
+#if WITH_AUDIT
VIR_FORCE_CLOSE(auditfd);
#endif
}
char *virAuditEncode(const char *key, const char *value)
{
-#if HAVE_AUDIT
+#if WITH_AUDIT
return audit_encode_nv_string(key, value, 0);
#else
char *str;