- stevesk@cvs.openbsd.org 2006/07/26 02:35:17

[atomicio.c auth.c dh.c authfile.c buffer.c clientloop.c kex.c] [groupaccess.c gss-genr.c kexgexs.c misc.c monitor.c monitor_mm.c] [packet.c scp.c serverloop.c session.c sftp-client.c sftp-common.c] [sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-keygen.c sshlogin.c] [uidswap.c xmalloc.c] move #include <sys/param.h> out of includes.h
2024-11-23 18:23:25 +08:00 · 2006-08-05 11:02:17 +10:00 · 2006-08-05 11:02:17 +10:00 · 8dbffe7904
commit 8dbffe7904
parent 9aec91948d
29 changed files with 74 additions and 34 deletions
--- a/9
+++ b/9
@ -11,6 +11,13 @@
     [channels.c clientloop.c packet.c scp.c serverloop.c sftp-client.c]
     [sftp-server.c ssh-agent.c ssh-keyscan.c sshconnect.c sshd.c]
     move #include <sys/time.h> out of includes.h
+   - stevesk@cvs.openbsd.org 2006/07/26 02:35:17
+     [atomicio.c auth.c dh.c authfile.c buffer.c clientloop.c kex.c]
+     [groupaccess.c gss-genr.c kexgexs.c misc.c monitor.c monitor_mm.c]
+     [packet.c scp.c serverloop.c session.c sftp-client.c sftp-common.c]
+     [sftp-server.c sftp.c ssh-add.c ssh-agent.c ssh-keygen.c sshlogin.c]
+     [uidswap.c xmalloc.c]
+     move #include <sys/param.h> out of includes.h

 20060804
 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@ -5081,4 +5088,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.4444 2006/08/05 00:57:45 djm Exp $
+$Id: ChangeLog,v 1.4445 2006/08/05 01:02:17 djm Exp $
--- a/atomicio.c
+++ b/atomicio.c
@ -1,4 +1,4 @@
-/* $OpenBSD: atomicio.c,v 1.21 2006/07/22 20:48:22 stevesk Exp $ */
+/* $OpenBSD: atomicio.c,v 1.22 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2006 Damien Miller. All rights reserved.
 * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
@ -28,6 +28,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <errno.h>
 #include <string.h>

--- a/auth.c
+++ b/auth.c
@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.72 2006/07/22 20:48:22 stevesk Exp $ */
+/* $OpenBSD: auth.c,v 1.73 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000 Markus Friedl.  All rights reserved.
 *
@ -27,6 +27,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>

 #include <errno.h>
 #ifdef HAVE_PATHS_H
--- a/authfile.c
+++ b/authfile.c
@ -1,4 +1,4 @@
-/* $OpenBSD: authfile.c,v 1.71 2006/07/22 20:48:22 stevesk Exp $ */
+/* $OpenBSD: authfile.c,v 1.72 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -40,6 +40,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>

 #include <openssl/err.h>
 #include <openssl/evp.h>
--- a/buffer.c
+++ b/buffer.c
@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.28 2006/07/22 20:48:22 stevesk Exp $ */
+/* $OpenBSD: buffer.c,v 1.29 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -14,6 +14,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <string.h>

 #include "xmalloc.h"
--- a/clientloop.c
+++ b/clientloop.c
@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.171 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: clientloop.c,v 1.172 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -63,6 +63,7 @@

 #include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
--- a/dh.c
+++ b/dh.c
@ -1,4 +1,4 @@
-/* $OpenBSD: dh.c,v 1.38 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: dh.c,v 1.39 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000 Niels Provos.  All rights reserved.
 *
@ -25,6 +25,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <openssl/bn.h>
 #include <openssl/dh.h>

--- a/groupaccess.c
+++ b/groupaccess.c
@ -1,4 +1,4 @@
-/* $OpenBSD: groupaccess.c,v 1.10 2006/07/17 01:31:09 stevesk Exp $ */
+/* $OpenBSD: groupaccess.c,v 1.11 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2001 Kevin Steves.  All rights reserved.
 *
@ -26,6 +26,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>

 #include <grp.h>
 #include <unistd.h>
--- a/gss-genr.c
+++ b/gss-genr.c
@ -1,4 +1,4 @@
-/* $OpenBSD: gss-genr.c,v 1.11 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: gss-genr.c,v 1.12 2006/07/26 02:35:17 stevesk Exp $ */

 /*
 * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -28,6 +28,8 @@

 #ifdef GSSAPI

+#include <sys/param.h>
+
 #include <string.h>
 #include <unistd.h>

--- a/includes.h
+++ b/includes.h
@ -82,7 +82,6 @@
 #ifdef HAVE_SYS_BSDTTY_H
 # include <sys/bsdtty.h>
 #endif
-#include <sys/param.h> /* For MAXPATHLEN and roundup() */
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
--- a/kex.c
+++ b/kex.c
@ -1,4 +1,4 @@
-/* $OpenBSD: kex.c,v 1.72 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: kex.c,v 1.73 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
 *
@ -25,6 +25,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <openssl/crypto.h>

 #include <string.h>
--- a/kexgexs.c
+++ b/kexgexs.c
@ -1,4 +1,4 @@
-/* $OpenBSD: kexgexs.c,v 1.5 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: kexgexs.c,v 1.6 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000 Niels Provos.  All rights reserved.
 * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@ -26,6 +26,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <string.h>

 #include "xmalloc.h"
--- a/misc.c
+++ b/misc.c
@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.60 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: misc.c,v 1.61 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000 Markus Friedl.  All rights reserved.
 * Copyright (c) 2005,2006 Damien Miller.  All rights reserved.
@ -29,6 +29,7 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/param.h>

 #include <stdarg.h>
 #include <string.h>
--- a/monitor.c
+++ b/monitor.c
@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.82 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: monitor.c,v 1.83 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@ -28,6 +28,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/wait.h>

--- a/monitor_mm.c
+++ b/monitor_mm.c
@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_mm.c,v 1.13 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: monitor_mm.c,v 1.14 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
 * All rights reserved.
@ -26,12 +26,13 @@

 #include "includes.h"

-#include <errno.h>
-#include <string.h>
-
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
+#include <sys/param.h>
+
+#include <errno.h>
+#include <string.h>

 #include "ssh.h"
 #include "xmalloc.h"
--- a/packet.c
+++ b/packet.c
@ -1,4 +1,4 @@
-/* $OpenBSD: packet.c,v 1.138 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: packet.c,v 1.139 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -41,6 +41,7 @@
 
 #include <sys/types.h>
 #include "openbsd-compat/sys-queue.h"
+#include <sys/param.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
--- a/scp.c
+++ b/scp.c
@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.151 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: scp.c,v 1.152 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * scp - secure remote copy.  This is basically patched BSD rcp which
 * uses ssh to do the data transfer (instead of using rcmd).
@ -74,6 +74,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
--- a/serverloop.c
+++ b/serverloop.c
@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.142 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: serverloop.c,v 1.143 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -38,6 +38,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_TIME_H
--- a/session.c
+++ b/session.c
@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.212 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: session.c,v 1.213 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
 *                    All rights reserved
@ -36,12 +36,13 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
 #include <sys/socket.h>
-#include <sys/wait.h>
 #include <sys/un.h>
+#include <sys/wait.h>

 #include <arpa/inet.h>

--- a/sftp-client.c
+++ b/sftp-client.c
@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.71 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.72 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
 *
@ -23,6 +23,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
--- a/sftp-common.c
+++ b/sftp-common.c
@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-common.c,v 1.17 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: sftp-common.c,v 1.18 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2001 Markus Friedl.  All rights reserved.
 * Copyright (c) 2001 Damien Miller.  All rights reserved.
@ -28,6 +28,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>

 #include <grp.h>
 #include <pwd.h>
--- a/sftp-server.c
+++ b/sftp-server.c
@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-server.c,v 1.66 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: sftp-server.c,v 1.67 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2000-2004 Markus Friedl.  All rights reserved.
 *
@ -17,6 +17,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
 #include <sys/stat.h>
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
--- a/sftp.c
+++ b/sftp.c
@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.87 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: sftp.c,v 1.88 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
 *
@ -22,6 +22,7 @@
 # include <sys/stat.h>
 #endif
 #include <sys/ioctl.h>
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <sys/wait.h>

--- a/ssh-add.c
+++ b/ssh-add.c
@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-add.c,v 1.85 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: ssh-add.c,v 1.86 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -39,6 +39,7 @@

 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/param.h>

 #include <openssl/evp.h>

--- a/ssh-agent.c
+++ b/ssh-agent.c
@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-agent.c,v 1.147 2006/07/25 02:59:21 stevesk Exp $ */
+/* $OpenBSD: ssh-agent.c,v 1.148 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -37,6 +37,8 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>
+#include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #ifdef HAVE_SYS_TIME_H
@ -46,7 +48,6 @@
 # include <sys/un.h>
 #endif
 #include "openbsd-compat/sys-queue.h"
-#include <sys/resource.h>

 #include <openssl/evp.h>
 #include <openssl/md5.h>
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.150 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.151 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -17,6 +17,7 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/param.h>

 #include <openssl/evp.h>
 #include <openssl/pem.h>
--- a/sshlogin.c
+++ b/sshlogin.c
@ -1,4 +1,4 @@
-/* $OpenBSD: sshlogin.c,v 1.22 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: sshlogin.c,v 1.23 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -42,6 +42,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>

 #include <errno.h>
 #include <fcntl.h>
--- a/uidswap.c
+++ b/uidswap.c
@ -1,4 +1,4 @@
-/* $OpenBSD: uidswap.c,v 1.33 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: uidswap.c,v 1.34 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -15,6 +15,7 @@
 #include "includes.h"

 #include <sys/types.h>
+#include <sys/param.h>

 #include <errno.h>
 #include <pwd.h>
--- a/xmalloc.c
+++ b/xmalloc.c
@ -1,4 +1,4 @@
-/* $OpenBSD: xmalloc.c,v 1.23 2006/07/22 20:48:23 stevesk Exp $ */
+/* $OpenBSD: xmalloc.c,v 1.24 2006/07/26 02:35:17 stevesk Exp $ */
 /*
 * Author: Tatu Ylonen <ylo@cs.hut.fi>
 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -15,6 +15,8 @@

 #include "includes.h"

+#include <sys/param.h>
+
 #include <stdarg.h>
 #include <string.h>