diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | includes.h | 2 | ||||
-rw-r--r-- | misc.c | 6 |
3 files changed, 10 insertions, 3 deletions
@@ -14,6 +14,9 @@ | |||
14 | - jmc@cvs.openbsd.org 2005/12/31 13:45:19 | 14 | - jmc@cvs.openbsd.org 2005/12/31 13:45:19 |
15 | [ssh.1] | 15 | [ssh.1] |
16 | .Nm does not require an argument; | 16 | .Nm does not require an argument; |
17 | - stevesk@cvs.openbsd.org 2006/01/01 08:59:27 | ||
18 | [includes.h misc.c] | ||
19 | move <net/if.h>; ok djm@ | ||
17 | 20 | ||
18 | 20060101 | 21 | 20060101 |
19 | - (djm) [Makefile.in configure.ac includes.h misc.c] | 22 | - (djm) [Makefile.in configure.ac includes.h misc.c] |
@@ -3604,4 +3607,4 @@ | |||
3604 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3607 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3605 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3608 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3606 | 3609 | ||
3607 | $Id: ChangeLog,v 1.4066 2006/01/02 12:38:37 djm Exp $ | 3610 | $Id: ChangeLog,v 1.4067 2006/01/02 12:40:10 djm Exp $ |
diff --git a/includes.h b/includes.h index 808d5dc9a..520817400 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.21 2005/12/08 18:34:11 reyk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -24,7 +24,11 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: misc.c,v 1.37 2005/12/08 18:34:11 reyk Exp $"); | 27 | RCSID("$OpenBSD: misc.c,v 1.38 2006/01/01 08:59:27 stevesk Exp $"); |
28 | |||
29 | #ifdef SSH_TUN_OPENBSD | ||
30 | #include <net/if.h> | ||
31 | #endif | ||
28 | 32 | ||
29 | #include "misc.h" | 33 | #include "misc.h" |
30 | #include "log.h" | 34 | #include "log.h" |