aboutsummaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2015-11-24 16:06:15 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2015-11-24 16:06:15 +0000
commitdb83e5424b8213ecaf1b52de56e896747f2391e7 (patch)
tree2486dba0b3da0725b26bdb96a433840ed69cc846 /crypto
parent046aad399a48d3166ad00f02b5e589ccda1ffd27 (diff)
Notes
Diffstat (limited to 'crypto')
-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 430fc1e024e5..56252f98b3e5 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 d5588e2b84c2..9a4b9c2d163f 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