- (dtucker) [audit.c audit.h auth.c auth1.c auth2.c loginrec.c monitor.c

   monitor_wrap.c monitor_wrap.h session.c sshd.c]: Prepend all of the audit
   defines and enums with SSH_ to prevent namespace collisions on some
   platforms (eg AIX).

1 files changed, 3 insertions, 3 deletions

diff --git a/session.c b/session.c
index b645144c5..a50bfcff7 100644
--- a/session.c
+++ b/session.c
@@ -665,7 +665,7 @@ do_exec(Session *s, const char *command)
                 debug("Forced command '%.900s'", command);
         }
 
-#ifdef AUDIT_EVENTS
+#ifdef SSH_AUDIT_EVENTS
         if (command != NULL)
                 PRIVSEP(audit_run_command(command));
         else if (s->ttyfd == -1) {
@@ -2333,8 +2333,8 @@ do_cleanup(Authctxt *authctxt)
         }
 #endif
 
-#ifdef AUDIT_EVENTS
-        PRIVSEP(audit_event(CONNECTION_CLOSE));
+#ifdef SSH_AUDIT_EVENTS
+        PRIVSEP(audit_event(SSH_CONNECTION_CLOSE));
 #endif
 
         /* remove agent socket */