summaryrefslogtreecommitdiff
path: root/sshd.8
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-08-19 03:18:06 +0000
committerDamien Miller <djm@mindrot.org>2016-08-23 14:29:07 +1000
commit83b581862a1dbb06fc859959f829dde2654aef3c (patch)
treefc8569112cdf47a9f27fc778ab9bf9d4fecdcfbb /sshd.8
parentffe6549c2f7a999cc5264b873a60322e91862581 (diff)
downloadopenssh-git-83b581862a1dbb06fc859959f829dde2654aef3c.tar.gz
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.8')
-rw-r--r--sshd.87
1 files changed, 2 insertions, 5 deletions
diff --git a/sshd.8 b/sshd.8
index 148a8b92..4cf8fee4 100644
--- a/sshd.8
+++ b/sshd.8
@@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $OpenBSD: sshd.8,v 1.285 2016/08/15 12:32:04 naddy Exp $
-.Dd $Mdocdate: August 15 2016 $
+.\" $OpenBSD: sshd.8,v 1.286 2016/08/19 03:18:06 djm Exp $
+.Dd $Mdocdate: August 19 2016 $
.Dt SSHD 8
.Os
.Sh NAME
@@ -504,9 +504,6 @@ Environment processing is disabled by default and is
controlled via the
.Cm PermitUserEnvironment
option.
-This option is automatically disabled if
-.Cm UseLogin
-is enabled.
.It Cm from="pattern-list"
Specifies that in addition to public key authentication, either the canonical
name of the remote host or its IP address must be present in the