summaryrefslogtreecommitdiff
path: root/session.c
diff options
context:
space:
mode:
authorotto@openbsd.org <otto@openbsd.org>2016-08-23 16:21:45 +0000
committerDamien Miller <djm@mindrot.org>2016-08-29 11:20:28 +1000
commitfc041c47144ce28cf71353124a8a5d183cd6a251 (patch)
treef8443e9733a2733200ce1f3ed32f5ac41a47513e /session.c
parent23555eb13a9b0550371a16dcf8beaab7a5806a64 (diff)
upstream commit
fix previous, a condition was modified incorrectly; ok markus@ deraadt@ Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453
Diffstat (limited to 'session.c')
-rw-r--r--session.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/session.c b/session.c
index fcfa80000..85805f5a0 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.284 2016/08/19 03:18:06 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.285 2016/08/23 16:21:45 otto Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -543,17 +543,11 @@ do_exec_pty(Session *s, const char *command)
543 close(ttyfd); 543 close(ttyfd);
544 544
545 /* record login, etc. similar to login(1) */ 545 /* record login, etc. similar to login(1) */
546#ifndef HAVE_OSF_SIA
547 if (command != NULL) {
548#ifdef _UNICOS 546#ifdef _UNICOS
549 cray_init_job(s->pw); /* set up cray jid and tmpdir */ 547 cray_init_job(s->pw); /* set up cray jid and tmpdir */
550#endif /* _UNICOS */ 548#endif /* _UNICOS */
551 do_login(s, command); 549#ifndef HAVE_OSF_SIA
552 } 550 do_login(s, command);
553# ifdef LOGIN_NEEDS_UTMPX
554 else
555 do_pre_login(s);
556# endif
557#endif 551#endif
558 /* 552 /*
559 * Do common processing for the child, such as execing 553 * Do common processing for the child, such as execing