Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Apr 2002 01:11:02 +0400
From:      "Andrey A. Chernov" <ache@nagual.pp.ru>
To:        Dag-Erling Smorgrav <des@FreeBSD.org>
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>
In-Reply-To: <200204220626.g3M6QTd05402@freefall.freebsd.org>
References:  <200204220626.g3M6QTd05402@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020422211102.GA31933>