diff options
| author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
| commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
| tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/compat.h | |
| parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
| download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/compat.h')
| -rw-r--r-- | crypto/openssh/compat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/openssh/compat.h b/crypto/openssh/compat.h index 7a50044..efa0f08 100644 --- a/crypto/openssh/compat.h +++ b/crypto/openssh/compat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.h,v 1.36 2003/08/29 10:03:15 markus Exp $ */ +/* $OpenBSD: compat.h,v 1.37 2003/11/02 11:01:03 markus Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -55,7 +55,6 @@ #define SSH_BUG_EXTEOF 0x00200000 #define SSH_BUG_PROBE 0x00400000 #define SSH_BUG_FIRSTKEX 0x00800000 -#define SSH_BUG_GSSAPI_BER 0x01000000 void enable_compat13(void); void enable_compat20(void); |
