diff options
| author | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2004-01-07 11:16:27 +0000 |
| commit | 7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866 (patch) | |
| tree | 5fffd9d1fcec3a05be383fc9aa81e1eb5e7935de /crypto/openssh/compat.h | |
| parent | b5f9e06a6d8d64c8429e25a1bc1ebfad436bf477 (diff) | |
| download | FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.zip FreeBSD-src-7545fb1c7eaf9a0f07cf592ab1b5aa8f59a59866.tar.gz | |
Resolve conflicts and remove obsolete files.
Sponsored by: registrar.no
Diffstat (limited to 'crypto/openssh/compat.h')
| -rw-r--r-- | crypto/openssh/compat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/compat.h b/crypto/openssh/compat.h index 881e450..7a50044 100644 --- a/crypto/openssh/compat.h +++ b/crypto/openssh/compat.h @@ -1,4 +1,4 @@ -/* $OpenBSD: compat.h,v 1.34 2003/04/01 10:31:26 markus Exp $ */ +/* $OpenBSD: compat.h,v 1.36 2003/08/29 10:03:15 markus Exp $ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -53,9 +53,9 @@ #define SSH_BUG_DERIVEKEY 0x00040000 #define SSH_BUG_DUMMYCHAN 0x00100000 #define SSH_BUG_EXTEOF 0x00200000 -#define SSH_BUG_K5USER 0x00400000 -#define SSH_BUG_PROBE 0x00800000 -#define SSH_BUG_FIRSTKEX 0x01000000 +#define SSH_BUG_PROBE 0x00400000 +#define SSH_BUG_FIRSTKEX 0x00800000 +#define SSH_BUG_GSSAPI_BER 0x01000000 void enable_compat13(void); void enable_compat20(void); |
