summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2015-11-24 16:06:15 +0000
committerdes <des@FreeBSD.org>2015-11-24 16:06:15 +0000
commit70c2c51da2ce1faac20da263b3a96ccb26d677f3 (patch)
tree2486dba0b3da0725b26bdb96a433840ed69cc846
parent745eb99f16975feb3b889e9cbd120749a5edfc2e (diff)
downloadFreeBSD-src-70c2c51da2ce1faac20da263b3a96ccb26d677f3.zip
FreeBSD-src-70c2c51da2ce1faac20da263b3a96ccb26d677f3.tar.gz
Remove description of the now-defunct NoneEnabled option.
-rw-r--r--crypto/openssh/session.c3
-rw-r--r--crypto/openssh/sshd_config3
2 files changed, 2 insertions, 4 deletions
diff --git a/crypto/openssh/session.c b/crypto/openssh/session.c
index 430fc1e..56252f9 100644
--- a/crypto/openssh/session.c
+++ b/crypto/openssh/session.c
@@ -1432,7 +1432,8 @@ static void
do_nologin(struct passwd *pw)
{
FILE *f = NULL;
- char buf[1024], *nl, *def_nl = _PATH_NOLOGIN;
+ char buf[1024], *def_nl = _PATH_NOLOGIN;
+ const char *nl;
struct stat sb;
#ifdef HAVE_LOGIN_CAP
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index d5588e2..9a4b9c2 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -137,9 +137,6 @@ Subsystem sftp /usr/libexec/sftp-server
# TCP receive socket buffer polling for HPN. Disable on non autotuning kernels.
#TcpRcvBufPoll yes
-# Allow the use of the NONE cipher.
-#NoneEnabled no
-
# Example of overriding settings on a per-user basis
#Match User anoncvs
# X11Forwarding no
OpenPOWER on IntegriCloud