From owner-cvs-all Mon Apr 22 14:13: 8 2002 Delivered-To: cvs-all@freebsd.org Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42]) by hub.freebsd.org (Postfix) with ESMTP id 2A0D637B6DC; Mon, 22 Apr 2002 14:12:11 -0700 (PDT) Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1]) by nagual.pp.ru (8.12.2/8.12.2) with ESMTP id g3MLB4iJ031986; Tue, 23 Apr 2002 01:11:07 +0400 (MSD) (envelope-from ache@pobrecita.freebsd.ru) Received: (from ache@localhost) by pobrecita.freebsd.ru (8.12.3/8.12.2/Submit) id g3MLB3Nf031985; Tue, 23 Apr 2002 01:11:03 +0400 (MSD) Date: Tue, 23 Apr 2002 01:11:02 +0400 From: "Andrey A. Chernov" To: Dag-Erling Smorgrav Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/crypto/openssh session.c Message-ID: <20020422211102.GA31933@nagual.pp.ru> References: <200204220626.g3M6QTd05402@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200204220626.g3M6QTd05402@freefall.freebsd.org> User-Agent: Mutt/1.3.28i Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Sun, Apr 21, 2002 at 23:26:29 -0700, Dag-Erling Smorgrav wrote: > des 2002/04/21 23:26:29 PDT > > Modified files: > crypto/openssh session.c > Log: > Don't report last login time in PAM case. (perforce change 10057) This change is not enough to satisfy sshd requirements. Please review this additional patch: --- session.c.bak Tue Apr 23 00:28:04 2002 +++ session.c Tue Apr 23 01:07:19 2002 @@ -671,10 +671,6 @@ do_pam_chauthtok(); } #endif -#ifdef USE_PAM - if (!check_quietlogin(s, command) && !pam_password_change_required()) - print_pam_messages(); -#endif /* USE_PAM */ #ifdef __FreeBSD__ if (pw->pw_change || pw->pw_expire) (void)gettimeofday(&tv, NULL); @@ -736,7 +732,12 @@ } #endif /* HAVE_LOGIN_CAP */ -#ifndef USE_PAM +#ifdef USE_PAM + if (command == NULL && options.print_lastlog && + !check_quietlogin(s, command) && + !options.use_login && !pam_password_change_required()) + print_pam_messages(); +#else /* !USE_PAM */ /* * If the user has logged in before, display the time of last * login. However, don't display anything extra if a command -- Andrey A. Chernov http://ache.pp.ru/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message