diff options
| author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
| commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
| tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/compat.h | |
| parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
| download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/compat.h')
| -rw-r--r-- | crypto/openssh/compat.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crypto/openssh/compat.h b/crypto/openssh/compat.h index 7afca04..4670108 100644 --- a/crypto/openssh/compat.h +++ b/crypto/openssh/compat.h @@ -1,4 +1,5 @@ -/* $OpenBSD: compat.h,v 1.32 2002/04/10 08:21:47 markus Exp $ */ +/* $OpenBSD: compat.h,v 1.33 2002/09/27 10:42:09 mickey Exp $ */ +/* $FreeBSD$ */ /* * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. @@ -54,6 +55,7 @@ #define SSH_BUG_DUMMYCHAN 0x00100000 #define SSH_BUG_EXTEOF 0x00200000 #define SSH_BUG_K5USER 0x00400000 +#define SSH_BUG_PROBE 0x00800000 void enable_compat13(void); void enable_compat20(void); |
