merge 5.7p1

1 files changed, 5 insertions, 5 deletions

diff --git a/audit.c b/audit.c
index dbea34cb2..ced57fa64 100644
--- a/audit.c
+++ b/audit.c
@@ -1,4 +1,4 @@
-/* $Id: audit.c,v 1.5 2006/09/01 05:38:36 djm Exp $ */
+/* $Id: audit.c,v 1.6 2011/01/17 10:15:30 dtucker Exp $ */
 
 /*
  * Copyright (c) 2004, 2005 Darren Tucker.  All rights reserved.
@@ -147,9 +147,9 @@ audit_event(ssh_audit_event_t event)
  * within a single connection.
  */
 void
-audit_session_open(const char *ttyn)
+audit_session_open(struct logininfo *li)
 {
-        const char *t = ttyn ? ttyn : "(no tty)";
+        const char *t = li->line ? li->line : "(no tty)";
 
         debug("audit session open euid %d user %s tty name %s", geteuid(),
             audit_username(), t);
@@ -163,9 +163,9 @@ audit_session_open(const char *ttyn)
  * within a single connection.
  */
 void
-audit_session_close(const char *ttyn)
+audit_session_close(struct logininfo *li)
 {
-        const char *t = ttyn ? ttyn : "(no tty)";
+        const char *t = li->line ? li->line : "(no tty)";
 
         debug("audit session close euid %d user %s tty name %s", geteuid(),
             audit_username(), t);