- dtucker@cvs.openbsd.org 2003/11/24 00:16:35
[ssh.1 ssh.c]
Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
diff --git a/ChangeLog b/ChangeLog
index 1bc08b3..4f9a9d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
[scp.c]
from portable: rename clashing variable limit-> limit_rate; ok markus@
(RCS ID sync only)
+ - dtucker@cvs.openbsd.org 2003/11/24 00:16:35
+ [ssh.1 ssh.c]
+ Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
20031122
- (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@
@@ -1527,4 +1530,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.3128 2003/11/24 02:09:27 djm Exp $
+$Id: ChangeLog,v 1.3129 2003/11/24 02:10:09 djm Exp $
diff --git a/ssh.1 b/ssh.1
index 1078415..25de869 100644
--- a/ssh.1
+++ b/ssh.1
@@ -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.1,v 1.178 2003/10/11 08:24:08 markus Exp $
+.\" $OpenBSD: ssh.1,v 1.179 2003/11/24 00:16:35 dtucker Exp $
.Dd September 25, 1999
.Dt SSH 1
.Os
@@ -539,8 +539,7 @@
options (and multiple identities specified in
configuration files).
.It Fl k
-Disables forwarding of Kerberos tickets.
-This may also be specified on a per-host basis in the configuration file.
+Disables forwarding (delegation) of GSSAPI credentials to the server.
.It Fl L Xo
.Sm off
.Ar port : host : hostport
diff --git a/ssh.c b/ssh.c
index e8639f6..d29ca37 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.203 2003/11/21 11:57:03 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.204 2003/11/24 00:16:35 dtucker Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -309,7 +309,7 @@
options.forward_agent = 1;
break;
case 'k':
- /* ignored for backward compatibility */
+ options.gss_deleg_creds = 0;
break;
case 'i':
if (stat(optarg, &st) < 0) {