summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-09-02 22:57:05 +1000
committerDamien Miller <djm@mindrot.org>2003-09-02 22:57:05 +1000
commit9b7b03b27084f0d7fca3caefc956d5c4c02e6928 (patch)
tree0bd0a5d61087832def36fff9b89b1a410412c267
parent134350c20c7e4aa428f9dbe8f9ba36e6027cfc1f (diff)
- markus@cvs.openbsd.org 2003/09/01 09:50:04
[sshd_config.5] gss kex is not supported; sxw@inf.ed.ac.uk
-rw-r--r--ChangeLog5
-rw-r--r--sshd_config.56
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index b641fe670..f04e98e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,9 @@
32 - markus@cvs.openbsd.org 2003/08/31 13:31:57 32 - markus@cvs.openbsd.org 2003/08/31 13:31:57
33 [gss-serv.c] 33 [gss-serv.c]
34 whitspace KNF 34 whitspace KNF
35 - markus@cvs.openbsd.org 2003/09/01 09:50:04
36 [sshd_config.5]
37 gss kex is not supported; sxw@inf.ed.ac.uk
35 38
3620030829 3920030829
37 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our 40 - (bal) openbsd-compat/ clean up. Considate headers, add in Id on our
@@ -947,4 +950,4 @@
947 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 950 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
948 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 951 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
949 952
950$Id: ChangeLog,v 1.2928 2003/09/02 12:56:42 djm Exp $ 953$Id: ChangeLog,v 1.2929 2003/09/02 12:57:05 djm Exp $
diff --git a/sshd_config.5 b/sshd_config.5
index 577605f3e..727fdb12a 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.24 2003/08/28 12:54:34 markus Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.25 2003/09/01 09:50:04 markus Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -226,9 +226,7 @@ or
226The default is 226The default is
227.Dq no . 227.Dq no .
228.It Cm GSSAPIAuthentication 228.It Cm GSSAPIAuthentication
229Specifies whether authentication based on GSSAPI may be used, either using 229Specifies whether user authentication based on GSSAPI is allowed.
230the result of a successful key exchange, or using GSSAPI user
231authentication.
232The default is 230The default is
233.Dq no . 231.Dq no .
234Note that this option applies to protocol version 2 only. 232Note that this option applies to protocol version 2 only.