diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | readconf.c | 4 | ||||
-rw-r--r-- | ssh_config.5 | 4 |
3 files changed, 8 insertions, 5 deletions
@@ -8,6 +8,9 @@ | |||
8 | ssh: remove wrong option from list | 8 | ssh: remove wrong option from list |
9 | sftp-server: Subsystem is documented in ssh_config(5), not sshd(8) | 9 | sftp-server: Subsystem is documented in ssh_config(5), not sshd(8) |
10 | ok deraadt@ markus@ | 10 | ok deraadt@ markus@ |
11 | - markus@cvs.openbsd.org 2003/10/08 15:21:24 | ||
12 | [readconf.c ssh_config.5] | ||
13 | default GSS API to no in client, too; ok jakob, deraadt@ | ||
11 | 14 | ||
12 | 20031009 | 15 | 20031009 |
13 | - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ | 16 | - (dtucker) [sshd_config.5] UsePAM defaults to "no". ok djm@ |
@@ -1325,4 +1328,4 @@ | |||
1325 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1328 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1326 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1329 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1327 | 1330 | ||
1328 | $Id: ChangeLog,v 1.3070 2003/10/15 05:50:42 dtucker Exp $ | 1331 | $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 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.121 2003/09/01 18:15:50 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.122 2003/10/08 15:21:24 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -885,7 +885,7 @@ fill_default_options(Options * options) | |||
885 | if (options->challenge_response_authentication == -1) | 885 | if (options->challenge_response_authentication == -1) |
886 | options->challenge_response_authentication = 1; | 886 | options->challenge_response_authentication = 1; |
887 | if (options->gss_authentication == -1) | 887 | if (options->gss_authentication == -1) |
888 | options->gss_authentication = 1; | 888 | options->gss_authentication = 0; |
889 | if (options->gss_deleg_creds == -1) | 889 | if (options->gss_deleg_creds == -1) |
890 | options->gss_deleg_creds = 0; | 890 | options->gss_deleg_creds = 0; |
891 | if (options->password_authentication == -1) | 891 | 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 @@ | |||
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: ssh_config.5,v 1.20 2003/09/02 18:50:06 jmc Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.21 2003/10/08 15:21:24 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -336,7 +336,7 @@ Specifies whether authentication based on GSSAPI may be used, either using | |||
336 | the result of a successful key exchange, or using GSSAPI user | 336 | the result of a successful key exchange, or using GSSAPI user |
337 | authentication. | 337 | authentication. |
338 | The default is | 338 | The default is |
339 | .Dq yes . | 339 | .Dq no . |
340 | Note that this option applies to protocol version 2 only. | 340 | Note that this option applies to protocol version 2 only. |
341 | .It Cm GSSAPIDelegateCredentials | 341 | .It Cm GSSAPIDelegateCredentials |
342 | Forward (delegate) credentials to the server. | 342 | Forward (delegate) credentials to the server. |