upstream commit

remove UseLogin option and support for having /bin/login
manage login sessions; ok deraadt markus dtucker

Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712

1 files changed, 2 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index fd89acbb9..a561c7b3e 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.473 2016/08/15 12:27:56 naddy Exp $ */
+/* $OpenBSD: sshd.c,v 1.474 2016/08/19 03:18:07 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -629,7 +629,7 @@ privsep_postauth(Authctxt *authctxt)
 #ifdef DISABLE_FD_PASSING
         if (1) {
 #else
-        if (authctxt->pw->pw_uid == 0 || options.use_login) {
+        if (authctxt->pw->pw_uid == 0) {
 #endif
                 /* File descriptor passing is broken or root login */
                 use_privsep = 0;