From 2bf56e2dba10e640ad11011c28eb79089443fa92 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 2 Apr 2002 20:32:46 +0000 Subject: - markus@cvs.openbsd.org 2002/03/28 15:34:51 [session.c] do not call record_login twice (for use_privsep) --- ChangeLog | 5 ++++- session.c | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ec5b98c8a..d2c0a2d0b 100644 --- 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 @@ -8114,4 +8117,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2008 2002/04/02 20:26:26 mouring Exp $ +$Id: ChangeLog,v 1.2009 2002/04/02 20:32:46 mouring Exp $ diff --git a/session.c b/session.c index d8ee69ad1..3daddbe11 100644 --- 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 /* -- cgit v1.2.3