summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2016-03-17 17:19:43 +0000
committerDamien Miller <djm@mindrot.org>2016-03-18 04:53:50 +1100
commit0235a5fa67fcac51adb564cba69011a535f86f6b (patch)
tree057533263b71e45bfa43cec0ced2c4c130c6dcfb
parent8c4739338f5e379d05b19d6e544540114965f07e (diff)
upstream commit
UseDNS affects ssh hostname processing in authorized_keys, not known_hosts; bz#2554 reported by jjelen AT redhat.com Upstream-ID: c1c1bb895dde46095fc6d81d8653703928437591
-rw-r--r--sshd_config.56
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd_config.5 b/sshd_config.5
index a37a3aca3..433b8f2c1 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 33.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 34.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35.\" 35.\"
36.\" $OpenBSD: sshd_config.5,v 1.220 2016/02/17 08:57:34 djm Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.221 2016/03/17 17:19:43 djm Exp $
37.Dd $Mdocdate: February 17 2016 $ 37.Dd $Mdocdate: March 17 2016 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
40.Sh NAME 40.Sh NAME
@@ -1534,7 +1534,7 @@ very same IP address.
1534If this option is set to 1534If this option is set to
1535.Dq no 1535.Dq no
1536(the default) then only addresses and not host names may be used in 1536(the default) then only addresses and not host names may be used in
1537.Pa ~/.ssh/known_hosts 1537.Pa ~/.ssh/authorized_keys
1538.Cm from 1538.Cm from
1539and 1539and
1540.Nm 1540.Nm