[openssh-unix-dev] Testing for the 4.4p1 release

[Darren Tucker]

On Fri, Sep 01, 2006 at 07:42:26PM -0500, David Bronder wrote:
> [AIX 5.2 ML4, IBM VAC 6 compiler, openssh-SNAP-20060902]
> 
> Builds (with some warnings) and tests OK (some exceptions).  See below
> for details.
[...]
> "/usr/include/paths.h", line 50.9: 1506-236 (W) Macro name _PATH_BSHELL has been redefined.
> "/usr/include/paths.h", line 50.9: 1506-358 (I) "_PATH_BSHELL" is defined on line 322 of defines.h.
> "/usr/include/paths.h", line 52.9: 1506-236 (W) Macro name _PATH_CSHELL has been redefined.
> "/usr/include/paths.h", line 52.9: 1506-358 (I) "_PATH_CSHELL" is defined on line 325 of defines.h.
> "/usr/include/paths.h", line 57.9: 1506-236 (W) Macro name _PATH_MAILDIR has been redefined.
> "/usr/include/paths.h", line 57.9: 1506-358 (I) "_PATH_MAILDIR" is defined on line 359 of defines.h.

Below is one way to fix these.  I'm not sure now is the right time to make
this kind of change, though.  (Again, you will need to run autoreconf to
rebuild configure.)

>   agent-getpeereid.sh  [skipped: need SUDO to switch to uid nobody]
>   agent-ptrace.sh      [skipped (not supported on this platform)]
>   dynamic-forward.sh   [skipped (no suitable ProxyCommand found)]

These are all normal, btw.


Index: configure.ac
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
retrieving revision 1.361
diff -u -p -r1.361 configure.ac
--- configure.ac	7 Sep 2006 01:11:29 -0000	1.361
+++ configure.ac	7 Sep 2006 05:01:49 -0000
@@ -3283,6 +3283,33 @@ else
 	AC_SUBST(XAUTH_PATH)
 fi
 
+
+AC_CHECK_DECL(_PATH_BSHELL, ,
+	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/bin/sh",
+	    [Define to your C shell if not defined in paths.h])
+	[ #include <paths.h> ]
+)
+
+AC_CHECK_DECL(_PATH_CSHELL, ,
+	AC_DEFINE_UNQUOTED(_PATH_CSHELL, "/bin/csh",
+	    [Define to your Bourne shell if not defined in paths.h])
+	[ #include <paths.h> ]
+)
+
+AC_CHECK_DECL(_PATH_SHELLS, ,
+	AC_DEFINE_UNQUOTED(_PATH_BSHELL, "/etc/shells",
+	    [Define to your shells file if not defined in paths.h])
+	[ #include <paths.h> ]
+)
+
+# if _PATH_MAILDIR is in paths.h then we won't go hunting for it.
+AC_CHECK_DECL(_PATH_MAILDIR,
+	AC_DEFINE(PATH_MAILDIR_IN_PATHS_H, 1,
+	    [Define if _PATH_MAILDIR is in paths.h]),
+	,
+	[ #include <paths.h> ]
+)
+
 # Check for mail directory (last resort if we cannot get it from headers)
 if test ! -z "$MAIL" ; then
 	maildir=`dirname $MAIL`
Index: defines.h
===================================================================
RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/defines.h,v
retrieving revision 1.137
diff -u -p -r1.137 defines.h
--- defines.h	18 Aug 2006 22:38:24 -0000	1.137
+++ defines.h	7 Sep 2006 05:00:52 -0000
@@ -318,16 +318,6 @@ struct winsize {
 
 /* Paths */
 
-#ifndef _PATH_BSHELL
-# define _PATH_BSHELL "/bin/sh"
-#endif
-#ifndef _PATH_CSHELL
-# define _PATH_CSHELL "/bin/csh"
-#endif
-#ifndef _PATH_SHELLS
-# define _PATH_SHELLS "/etc/shells"
-#endif
-
 #ifdef USER_PATH
 # ifdef _PATH_STDPATH
 #  undef _PATH_STDPATH
@@ -347,6 +337,8 @@ struct winsize {
 # define _PATH_DEVNULL "/dev/null"
 #endif
 
+#ifndef PATH_MAILDIR_IN_PATHS_H
+
 #ifndef MAIL_DIRECTORY
 # define MAIL_DIRECTORY "/var/spool/mail"
 #endif
@@ -359,6 +351,8 @@ struct winsize {
 # define _PATH_MAILDIR MAILDIR
 #endif /* !defined(_PATH_MAILDIR) && defined(MAILDIR) */
 
+#endif /* PATH_MAILDIR_IN_PATHS_H */
+
 #ifndef _PATH_NOLOGIN
 # define _PATH_NOLOGIN "/etc/nologin"
 #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.