diff options
author | djm@openbsd.org <djm@openbsd.org> | 2016-08-19 03:18:06 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2016-08-23 14:29:07 +1000 |
commit | 83b581862a1dbb06fc859959f829dde2654aef3c (patch) | |
tree | fc8569112cdf47a9f27fc778ab9bf9d4fecdcfbb /sshd.c | |
parent | ffe6549c2f7a999cc5264b873a60322e91862581 (diff) |
upstream commit
remove UseLogin option and support for having /bin/login
manage login sessions; ok deraadt markus dtucker
Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.473 2016/08/15 12:27:56 naddy Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.474 2016/08/19 03:18:07 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -629,7 +629,7 @@ privsep_postauth(Authctxt *authctxt) | |||
629 | #ifdef DISABLE_FD_PASSING | 629 | #ifdef DISABLE_FD_PASSING |
630 | if (1) { | 630 | if (1) { |
631 | #else | 631 | #else |
632 | if (authctxt->pw->pw_uid == 0 || options.use_login) { | 632 | if (authctxt->pw->pw_uid == 0) { |
633 | #endif | 633 | #endif |
634 | /* File descriptor passing is broken or root login */ | 634 | /* File descriptor passing is broken or root login */ |
635 | use_privsep = 0; | 635 | use_privsep = 0; |