[ssh.1 ssh.c]
     Make ssh -k mean GSSAPIDelegateCredentials=no. Suggestion & ok markus@
This commit is contained in:
Damien Miller 2003-11-24 13:10:09 +11:00
parent a4b33dfb6d
commit e0113ccc08
3 changed files with 8 additions and 6 deletions

View File

@ -14,6 +14,9 @@
[scp.c] [scp.c]
from portable: rename clashing variable limit-> limit_rate; ok markus@ from portable: rename clashing variable limit-> limit_rate; ok markus@
(RCS ID sync only) (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 20031122
- (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

5
ssh.1
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" 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 .Dd September 25, 1999
.Dt SSH 1 .Dt SSH 1
.Os .Os
@ -539,8 +539,7 @@ It is possible to have multiple
options (and multiple identities specified in options (and multiple identities specified in
configuration files). configuration files).
.It Fl k .It Fl k
Disables forwarding of Kerberos tickets. Disables forwarding (delegation) of GSSAPI credentials to the server.
This may also be specified on a per-host basis in the configuration file.
.It Fl L Xo .It Fl L Xo
.Sm off .Sm off
.Ar port : host : hostport .Ar port : host : hostport

4
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -309,7 +309,7 @@ again:
options.forward_agent = 1; options.forward_agent = 1;
break; break;
case 'k': case 'k':
/* ignored for backward compatibility */ options.gss_deleg_creds = 0;
break; break;
case 'i': case 'i':
if (stat(optarg, &st) < 0) { if (stat(optarg, &st) < 0) {