- markus@cvs.openbsd.org 2002/03/28 15:34:51

     [session.c]
     do not call record_login twice (for use_privsep)

diff --git a/ChangeLog b/ChangeLog
index b2f037491d32fba63b94502d06c774c7089456d7..a8f515d51d0c46551428d78efe679e8c01fade86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
    - markus@cvs.openbsd.org 2002/03/27 22:21:45
      [ssh-keygen.c]
      try to import keys with extra trailing === (seen with ssh.com < 2.0.12)
+   - markus@cvs.openbsd.org 2002/03/28 15:34:51
+     [session.c]
+     do not call record_login twice (for use_privsep)
 
 20020401
  - (stevesk) [monitor.c] PAM should work again; will *not* work with

diff --git a/session.c b/session.c
index d8ee69ad108b344845a4cedce3a18c624c7a58d2..3daddbe11a0c2f2e80c8f1817733ce75d4f35b3f 100644 (file)
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.132 2002/03/19 10:49:35 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.133 2002/03/28 15:34:51 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -648,9 +648,11 @@ do_login(Session *s, const char *command)
        }
 
        /* Record that there was a login on that tty from the remote host. */
-       record_login(pid, s->tty, pw->pw_name, pw->pw_uid,
-           get_remote_name_or_ip(utmp_len, options.verify_reverse_mapping),
-           (struct sockaddr *)&from);
+       if (!use_privsep)
+               record_login(pid, s->tty, pw->pw_name, pw->pw_uid,
+                   get_remote_name_or_ip(utmp_len,
+                   options.verify_reverse_mapping),
+                   (struct sockaddr *)&from);
 
 #ifdef USE_PAM
        /*