On Wed, Mar 28, 2007 at 03:13:07PM +1000, Darren Tucker wrote:
> Now that we're trying to include headers once only from the .c file, the
> system includes where these are defined are no longer in includes.h
> and thus this kind of thing isn't defined when defines.h is read. They
> get defined in defines.h and again by the system headers, which
> generates the warning.
This is the kind of thing I meant. If you try it you will need to run
"autoreconf" to rebuild configure, then rerun configure.
Index: configure.ac
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh/configure.ac,v
retrieving revision 1.375
diff -u -p -r1.375 configure.ac
--- configure.ac 26 Mar 2007 16:35:28 -0000 1.375
+++ configure.ac 28 Mar 2007 09:50:47 -0000
@@ -216,6 +216,7 @@ AC_CHECK_HEADERS( \
sys/mman.h \
sys/ndir.h \
sys/prctl.h \
+ sys/param.h \
sys/pstat.h \
sys/select.h \
sys/stat.h \
@@ -1364,6 +1365,18 @@ AC_CHECK_DECLS(writev, , , [
#include <unistd.h>
])
+AC_CHECK_DECLS(MAXSYMLINKS, , , [
+#include <limits.h>
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+ ])
+
+AC_CHECK_DECLS([_PATH_BSHELL, _PATH_CSHELL, _PATH_SHELLS, _PATH_STDPATH,
+ _PATH_DEVNULL, _PATH_NOLOGIN, _PATH_TTY], , , [
+#include <paths.h>
+ ])
+
AC_CHECK_FUNCS(setresuid, [
dnl Some platorms have setresuid that isn't implemented, test for this
AC_MSG_CHECKING(if setresuid seems to work)
Index: defines.h
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh/defines.h,v
retrieving revision 1.139
diff -u -p -r1.139 defines.h
--- defines.h 26 Mar 2007 16:35:28 -0000 1.139
+++ defines.h 28 Mar 2007 09:42:59 -0000
@@ -68,7 +68,7 @@ enum
# endif
#endif
-#ifndef MAXSYMLINKS
+#if HAVE_DECL_MAXSYMLINKS == 0
# define MAXSYMLINKS 5
#endif
@@ -318,13 +318,13 @@ struct winsize {
/* Paths */
-#ifndef _PATH_BSHELL
+#if HAVE_DECL__PATH_BSHELL == 0
# define _PATH_BSHELL "/bin/sh"
#endif
-#ifndef _PATH_CSHELL
+#if HAVE_DECL__PATH_CSHELL == 0
# define _PATH_CSHELL "/bin/csh"
#endif
-#ifndef _PATH_SHELLS
+#if HAVE_DECL__PATH_SHELLS == 0
# define _PATH_SHELLS "/etc/shells"
#endif
@@ -335,7 +335,7 @@ struct winsize {
# define _PATH_STDPATH USER_PATH
#endif
-#ifndef _PATH_STDPATH
+#if HAVE_DECL__PATH_STDPATH == 0
# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
#endif
@@ -343,7 +343,7 @@ struct winsize {
# define SUPERUSER_PATH _PATH_STDPATH
#endif
-#ifndef _PATH_DEVNULL
+#if HAVE_DECL__PATH_DEVNULL == 0
# define _PATH_DEVNULL "/dev/null"
#endif
@@ -359,7 +359,7 @@ struct winsize {
# define _PATH_MAILDIR MAILDIR
#endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
-#ifndef _PATH_NOLOGIN
+#if HAVE_DECL__PATH_NOLOGIN == 0
# define _PATH_NOLOGIN "/etc/nologin"
#endif
@@ -378,7 +378,7 @@ struct winsize {
#endif /* X_UNIX_PATH */
#define _PATH_UNIX_X X_UNIX_PATH
-#ifndef _PATH_TTY
+#if HAVE_DECL__PATH_TTY == 0
# define _PATH_TTY "/dev/tty"
#endif
--
Darren Tucker (dtucker at zip.com.au)
GPG key 8FF4FA69 / D9A3 86E9 7EEE AF4B B2D4 37C9 C982 80C7 8FF4 FA69
Good judgement comes with experience. Unfortunately, the experience
usually comes from bad judgement.
_______________________________________________
openssh-unix-dev mailing list
openssh-unix-dev@mindrot.org
http://lists.mindrot.org/mailman/listinfo/openssh-unix-dev
|