diff options
| author | otto@openbsd.org <otto@openbsd.org> | 2016-08-23 16:21:45 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-08-29 11:20:28 +1000 |
| commit | fc041c47144ce28cf71353124a8a5d183cd6a251 (patch) | |
| tree | f8443e9733a2733200ce1f3ed32f5ac41a47513e | |
| parent | 23555eb13a9b0550371a16dcf8beaab7a5806a64 (diff) | |
upstream commit
fix previous, a condition was modified incorrectly; ok
markus@ deraadt@
Upstream-ID: c443e339768e7ed396dff3bb55f693e7d3641453
| -rw-r--r-- | session.c | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -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@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) */ -#ifndef HAVE_OSF_SIA - if (command != NULL) { #ifdef _UNICOS - cray_init_job(s->pw); /* set up cray jid and tmpdir */ + 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 +#ifndef HAVE_OSF_SIA + do_login(s, command); #endif /* * Do common processing for the child, such as execing |