summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sshd_config.54
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84283a3e1..b4c028568 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 shd_config PermitTTY to disallow TTY allocation, mirroring the 9 shd_config PermitTTY to disallow TTY allocation, mirroring the
10 longstanding no-pty authorized_keys option; 10 longstanding no-pty authorized_keys option;
11 bz#2070, patch from Teran McKinney; ok markus@ 11 bz#2070, patch from Teran McKinney; ok markus@
12 - jmc@cvs.openbsd.org 2013/10/29 18:49:32
13 [sshd_config.5]
14 pty(4), not pty(7);
12 15
1320131026 1620131026
14 - (djm) OpenBSD CVS Sync 17 - (djm) OpenBSD CVS Sync
diff --git a/sshd_config.5 b/sshd_config.5
index c3e30e614..bcfcc9c32 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,7 +33,7 @@
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.164 2013/10/29 09:48:02 djm Exp $ 36.\" $OpenBSD: sshd_config.5,v 1.165 2013/10/29 18:49:32 jmc Exp $
37.Dd $Mdocdate: October 29 2013 $ 37.Dd $Mdocdate: October 29 2013 $
38.Dt SSHD_CONFIG 5 38.Dt SSHD_CONFIG 5
39.Os 39.Os
@@ -945,7 +945,7 @@ The default is
945.Dq no . 945.Dq no .
946.It Cm PermitTTY 946.It Cm PermitTTY
947Specifies whether 947Specifies whether
948.Xr pty 7 948.Xr pty 4
949allocation is permitted. 949allocation is permitted.
950The default is 950The default is
951.Dq yes . 951.Dq yes .