diff options
| author | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-03-18 10:09:43 +0000 |
| commit | 6534271ec8abc00a8016a575a8e7151d944ef5a8 (patch) | |
| tree | a7d90beaf7fa4922f64c5a6eca7154fa082e43a1 /crypto/openssh/ssh.h | |
| parent | d3e3318ac7d7a176fefa5849509c01442694b4c7 (diff) | |
| download | FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.zip FreeBSD-src-6534271ec8abc00a8016a575a8e7151d944ef5a8.tar.gz | |
Fix conflicts.
Diffstat (limited to 'crypto/openssh/ssh.h')
| -rw-r--r-- | crypto/openssh/ssh.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/openssh/ssh.h b/crypto/openssh/ssh.h index 7485fb8..6848e1e 100644 --- a/crypto/openssh/ssh.h +++ b/crypto/openssh/ssh.h @@ -1,3 +1,6 @@ +/* $OpenBSD: ssh.h,v 1.64 2002/03/04 17:27:39 stevesk Exp $ */ +/* $FreeBSD$ */ + /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -10,9 +13,6 @@ * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$OpenBSD: ssh.h,v 1.62 2001/01/23 10:45:10 markus Exp $"); */ -/* RCSID("$FreeBSD$"); */ - #ifndef SSH_H #define SSH_H @@ -83,8 +83,8 @@ /* Name of Kerberos service for SSH to use. */ #define KRB4_SERVICE_NAME "rcmd" -/* Kerberos IV tickets can't be forwarded. This is an AFS hack! */ -#define SSH_CMSG_HAVE_KRB4_TGT SSH_CMSG_HAVE_KERBEROS_TGT /* credentials (s) */ +/* Used to identify ``EscapeChar none'' */ +#define SSH_ESCAPECHAR_NONE -2 #ifdef USE_PAM #include "auth-pam.h" |
