[auth.c clientloop.c includes.h misc.c monitor.c readpass.c]
     [session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
     [sshd.c sshpty.c]
     move #include <paths.h> out of includes.h; ok markus@
This commit is contained in:
Damien Miller 2006-03-15 11:16:59 +11:00
parent de6dd0a35f
commit 03e2003a23
15 changed files with 54 additions and 21 deletions

View File

@ -26,6 +26,11 @@
- stevesk@cvs.openbsd.org 2006/02/07 03:59:20
[deattack.c]
duplicate #include
- stevesk@cvs.openbsd.org 2006/02/08 12:15:27
[auth.c clientloop.c includes.h misc.c monitor.c readpass.c]
[session.c sftp.c ssh-agent.c ssh-keysign.c ssh.c sshconnect.c]
[sshd.c sshpty.c]
move #include <paths.h> out of includes.h; ok markus@
20060313
- (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@ -3927,4 +3932,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.4147 2006/03/15 00:12:38 djm Exp $
$Id: ChangeLog,v 1.4148 2006/03/15 00:16:59 djm Exp $

5
auth.c
View File

@ -23,8 +23,11 @@
*/
#include "includes.h"
RCSID("$OpenBSD: auth.c,v 1.60 2005/06/17 02:44:32 djm Exp $");
RCSID("$OpenBSD: auth.c,v 1.61 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#ifdef HAVE_LOGIN_H
#include <login.h>
#endif

View File

@ -59,8 +59,9 @@
*/
#include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.150 2006/02/07 01:42:00 stevesk Exp $");
RCSID("$OpenBSD: clientloop.c,v 1.151 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include <termios.h>
#include "ssh.h"

View File

@ -1,4 +1,4 @@
/* $OpenBSD: includes.h,v 1.25 2006/02/07 01:42:00 stevesk Exp $ */
/* $OpenBSD: includes.h,v 1.26 2006/02/08 12:15:27 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@ -90,9 +90,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
#ifdef HAVE_LASTLOG_H
# include <lastlog.h>
#endif
#ifdef HAVE_PATHS_H
# include <paths.h> /* For _PATH_XXX */
#endif
#include <sys/types.h>
#include <sys/socket.h>

5
misc.c
View File

@ -24,8 +24,11 @@
*/
#include "includes.h"
RCSID("$OpenBSD: misc.c,v 1.42 2006/01/31 10:19:02 djm Exp $");
RCSID("$OpenBSD: misc.c,v 1.43 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#ifdef SSH_TUN_OPENBSD
#include <net/if.h>
#endif

View File

@ -25,14 +25,16 @@
*/
#include "includes.h"
RCSID("$OpenBSD: monitor.c,v 1.64 2005/10/13 22:24:31 stevesk Exp $");
RCSID("$OpenBSD: monitor.c,v 1.65 2006/02/08 12:15:27 stevesk Exp $");
#include <openssl/dh.h>
#include <paths.h>
#ifdef SKEY
#include <skey.h>
#endif
#include <openssl/dh.h>
#include "ssh.h"
#include "auth.h"
#include "kex.h"

View File

@ -23,7 +23,11 @@
*/
#include "includes.h"
RCSID("$OpenBSD: readpass.c,v 1.33 2005/05/02 21:13:22 markus Exp $");
RCSID("$OpenBSD: readpass.c,v 1.34 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#include "xmalloc.h"
#include "misc.h"

View File

@ -33,7 +33,9 @@
*/
#include "includes.h"
RCSID("$OpenBSD: session.c,v 1.191 2005/12/24 02:27:41 djm Exp $");
RCSID("$OpenBSD: session.c,v 1.192 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include "ssh.h"
#include "ssh1.h"

5
sftp.c
View File

@ -16,8 +16,11 @@
#include "includes.h"
RCSID("$OpenBSD: sftp.c,v 1.70 2006/01/31 10:19:02 djm Exp $");
RCSID("$OpenBSD: sftp.c,v 1.71 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#ifdef USE_LIBEDIT
#include <histedit.h>
#else

View File

@ -35,8 +35,11 @@
#include "includes.h"
#include "openbsd-compat/sys-queue.h"
RCSID("$OpenBSD: ssh-agent.c,v 1.125 2006/02/07 01:18:09 stevesk Exp $");
RCSID("$OpenBSD: ssh-agent.c,v 1.126 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#include <openssl/evp.h>
#include <openssl/md5.h>

View File

@ -22,7 +22,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
RCSID("$OpenBSD: ssh-keysign.c,v 1.19 2005/09/13 23:40:07 djm Exp $");
RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include <openssl/evp.h>
#include <openssl/rand.h>

4
ssh.c
View File

@ -40,7 +40,9 @@
*/
#include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.257 2005/12/20 04:41:07 dtucker Exp $");
RCSID("$OpenBSD: ssh.c,v 1.258 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include <openssl/evp.h>
#include <openssl/err.h>

View File

@ -13,7 +13,9 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.171 2005/12/06 22:38:27 reyk Exp $");
RCSID("$OpenBSD: sshconnect.c,v 1.172 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include <openssl/bn.h>

4
sshd.c
View File

@ -42,7 +42,9 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshd.c,v 1.318 2005/12/24 02:27:41 djm Exp $");
RCSID("$OpenBSD: sshd.c,v 1.319 2006/02/08 12:15:27 stevesk Exp $");
#include <paths.h>
#include <openssl/dh.h>
#include <openssl/bn.h>

View File

@ -12,10 +12,12 @@
*/
#include "includes.h"
RCSID("$OpenBSD: sshpty.c,v 1.13 2006/02/07 01:42:00 stevesk Exp $");
RCSID("$OpenBSD: sshpty.c,v 1.14 2006/02/08 12:15:27 stevesk Exp $");
#ifdef HAVE_PATHS_H
# include <paths.h>
#endif
#include <termios.h>
#ifdef HAVE_UTIL_H
# include <util.h>
#endif /* HAVE_UTIL_H */