diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-24 13:10:09 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-24 13:10:09 +1100 |
commit | e0113ccc08725142ca263dd61734bc93e1a3d39b (patch) | |
tree | 4ed61fc814aaab9fece8dfe2cbad8cf0c41877ac | |
parent | a4b33dfb6dff6bebb8f08f72eabaa796aa8bb7d4 (diff) |
- dtucker@cvs.openbsd.org 2003/11/24 00:16:35
[ssh.1 ssh.c]
Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 5 | ||||
-rw-r--r-- | ssh.c | 4 |
3 files changed, 8 insertions, 6 deletions
@@ -14,6 +14,9 @@ | |||
14 | [scp.c] | 14 | [scp.c] |
15 | from portable: rename clashing variable limit-> limit_rate; ok markus@ | 15 | from portable: rename clashing variable limit-> limit_rate; ok markus@ |
16 | (RCS ID sync only) | 16 | (RCS ID sync only) |
17 | - dtucker@cvs.openbsd.org 2003/11/24 00:16:35 | ||
18 | [ssh.1 ssh.c] | ||
19 | Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@ | ||
17 | 20 | ||
18 | 20031122 | 21 | 20031122 |
19 | - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ | 22 | - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ |
@@ -1527,4 +1530,4 @@ | |||
1527 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1530 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1528 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1531 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1529 | 1532 | ||
1530 | $Id: ChangeLog,v 1.3128 2003/11/24 02:09:27 djm Exp $ | 1533 | $Id: ChangeLog,v 1.3129 2003/11/24 02:10:09 djm Exp $ |
@@ -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.1,v 1.178 2003/10/11 08:24:08 markus Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.179 2003/11/24 00:16:35 dtucker Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -539,8 +539,7 @@ It is possible to have multiple | |||
539 | options (and multiple identities specified in | 539 | options (and multiple identities specified in |
540 | configuration files). | 540 | configuration files). |
541 | .It Fl k | 541 | .It Fl k |
542 | Disables forwarding of Kerberos tickets. | 542 | Disables forwarding (delegation) of GSSAPI credentials to the server. |
543 | This may also be specified on a per-host basis in the configuration file. | ||
544 | .It Fl L Xo | 543 | .It Fl L Xo |
545 | .Sm off | 544 | .Sm off |
546 | .Ar port : host : hostport | 545 | .Ar port : host : hostport |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.203 2003/11/21 11:57:03 djm Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.204 2003/11/24 00:16:35 dtucker Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -309,7 +309,7 @@ again: | |||
309 | options.forward_agent = 1; | 309 | options.forward_agent = 1; |
310 | break; | 310 | break; |
311 | case 'k': | 311 | case 'k': |
312 | /* ignored for backward compatibility */ | 312 | options.gss_deleg_creds = 0; |
313 | break; | 313 | break; |
314 | case 'i': | 314 | case 'i': |
315 | if (stat(optarg, &st) < 0) { | 315 | if (stat(optarg, &st) < 0) { |