- (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, 5 insertions, 5 deletions

diff --git a/sshd.c b/sshd.c
index e61870ea5..6b379521b 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1628,7 +1628,7 @@ main(int ac, char **av)
         remote_port = get_remote_port();
         remote_ip = get_remote_ipaddr();
 
-#ifdef AUDIT_EVENTS
+#ifdef SSH_AUDIT_EVENTS
         audit_connection_from(remote_ip, remote_port);
 #endif
 #ifdef LIBWRAP
@@ -1700,8 +1700,8 @@ main(int ac, char **av)
         }
 
  authenticated:
-#ifdef AUDIT_EVENTS
-        audit_event(AUTH_SUCCESS);
+#ifdef SSH_AUDIT_EVENTS
+        audit_event(SSH_AUTH_SUCCESS);
 #endif
 
         /*
@@ -2017,10 +2017,10 @@ cleanup_exit(int i)
 {
         if (the_authctxt)
                 do_cleanup(the_authctxt);
-#ifdef AUDIT_EVENTS
+#ifdef SSH_AUDIT_EVENTS
         /* done after do_cleanup so it can cancel the PAM auth 'thread' */
         if (!use_privsep || mm_is_monitor())
-                audit_event(CONNECTION_ABANDON);
+                audit_event(SSH_CONNECTION_ABANDON);
 #endif
         _exit(i);
 }