diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /compat.c | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'compat.c')
-rw-r--r-- | compat.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: compat.c,v 1.79 2011/09/23 07:45:05 markus Exp $ */ | 1 | /* $OpenBSD: compat.c,v 1.80 2012/08/17 01:30:00 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. |
4 | * | 4 | * |
@@ -45,6 +45,8 @@ int datafellows = 0; | |||
45 | void | 45 | void |
46 | enable_compat20(void) | 46 | enable_compat20(void) |
47 | { | 47 | { |
48 | if (compat20) | ||
49 | return; | ||
48 | debug("Enabling compatibility mode for protocol 2.0"); | 50 | debug("Enabling compatibility mode for protocol 2.0"); |
49 | compat20 = 1; | 51 | compat20 = 1; |
50 | } | 52 | } |