commit 83b581862a1dbb06fc859959f829dde2654aef3c
author djm@openbsd.org <djm@openbsd.org> Fri Aug 19 03:18:06 2016 +0000
committer Damien Miller <djm@mindrot.org> Tue Aug 23 14:29:07 2016 +1000
tree fc8569112cdf47a9f27fc778ab9bf9d4fecdcfbb
parent ffe6549c2f7a999cc5264b873a60322e91862581

upstream commit

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

Upstream-ID: bea7213fbf158efab7e602d9d844fba4837d2712

sshd.c

diff --git a/sshd.c b/sshd.c
index fd89acb..a561c7b 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 @@
 #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;