From a044f47679c27ca77b3ec19a6e0e148deb50a427 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 15 Oct 2003 15:52:03 +1000 Subject: - markus@cvs.openbsd.org 2003/10/08 15:21:24 [readconf.c ssh_config.5] default GSS API to no in client, too; ok jakob, deraadt@ --- ChangeLog | 5 ++++- readconf.c | 4 ++-- ssh_config.5 | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2c3255c9..6dbe21d3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ ssh: remove wrong option from list sftp-server: Subsystem is documented in ssh_config(5), not sshd(8) ok deraadt@ markus@ + - markus@cvs.openbsd.org 2003/10/08 15:21:24 + [readconf.c ssh_config.5] + default GSS API to no in client, too; ok jakob, deraadt@ 20031009 - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ @@ -1325,4 +1328,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3070 2003/10/15 05:50:42 dtucker Exp $ +$Id: ChangeLog,v 1.3071 2003/10/15 05:52:03 dtucker Exp $ diff --git a/readconf.c b/readconf.c index 13987ffa7..5a7084fe8 100644 --- a/readconf.c +++ b/readconf.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.122 2003/10/08 15:21:24 markus Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -885,7 +885,7 @@ fill_default_options(Options * options) if (options->challenge_response_authentication == -1) options->challenge_response_authentication = 1; if (options->gss_authentication == -1) - options->gss_authentication = 1; + options->gss_authentication = 0; if (options->gss_deleg_creds == -1) options->gss_deleg_creds = 0; if (options->password_authentication == -1) diff --git a/ssh_config.5 b/ssh_config.5 index 7a435a90e..da162499b 100644 --- a/ssh_config.5 +++ b/ssh_config.5 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh_config.5,v 1.20 2003/09/02 18:50:06 jmc Exp $ +.\" $OpenBSD: ssh_config.5,v 1.21 2003/10/08 15:21:24 markus Exp $ .Dd September 25, 1999 .Dt SSH_CONFIG 5 .Os @@ -336,7 +336,7 @@ Specifies whether authentication based on GSSAPI may be used, either using the result of a successful key exchange, or using GSSAPI user authentication. The default is -.Dq yes . +.Dq no . Note that this option applies to protocol version 2 only. .It Cm GSSAPIDelegateCredentials Forward (delegate) credentials to the server. -- cgit v1.2.3