[openssh-commits] [openssh] 02/07: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit fc041c47144ce28cf71353124a8a5d183cd6a251
Author: otto at openbsd.org <otto at openbsd.org>
Date:   Tue Aug 23 16:21:45 2016 +0000

    upstream commit
    
    fix previous, a condition was modified incorrectly; ok
    markus@ deraadt@
    
    Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453
---
 session.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/session.c b/session.c
index fcfa800..85805f5 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.284 2016/08/19 03:18:06 djm Exp $ */
+/* $OpenBSD: session.c,v 1.285 2016/08/23 16:21:45 otto Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -543,17 +543,11 @@ do_exec_pty(Session *s, const char *command)
 		close(ttyfd);
 
 		/* record login, etc. similar to login(1) */
+#ifdef _UNICOS
+		cray_init_job(s->pw); /* set up cray jid and tmpdir */
+#endif /* _UNICOS */
 #ifndef HAVE_OSF_SIA
-		if (command != NULL) {
-#ifdef _UNICOS
-			cray_init_job(s->pw); /* set up cray jid and tmpdir */
-#endif /* _UNICOS */
-			do_login(s, command);
-		}
-# ifdef LOGIN_NEEDS_UTMPX
-		else
-			do_pre_login(s);
-# endif
+		do_login(s, command);
 #endif
 		/*
 		 * Do common processing for the child, such as execing

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.