* minor new port: ia64-hp-hpux11.23

* m4/macros/check_libwrap_severity.m4 (LIBS): also test if caller
needs to define rfc931_timeout.

* amd/sun2amd.c: define rfc931_timeout and allow/deny_severity for
libwrap.

* amd/amq_svc.c: some versions of libwrap require the caller to
define rfc931_timeout in addition to allow/deny_severity.

* amd/amfs_toplvl.c (amfs_toplvl_init): properly detect when
forced unmount functionality exists for all systems.

* libamu/mount_fs.c (compute_nfs_args): reset nfs_args_t->pathconf
only if field exists.

* conf/nfs_prot/nfs_prot_hpux11.h: prevent HPUX 11.23 from
including <tiuser> or <sys/tiuser> (TLI definitions are already
included from elsewhere).

* configure.in: detect nfs_args_t->pathconf field.

diff --git a/.cvsignore b/.cvsignore
index b9bcaad127ab51b69b8c62cc4a6ffbeb6e3d6b69..b27329bdc0e07d8f898366e1043ffa798fdfbf6e 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -174,3 +174,4 @@ A.i386-pc-linux-centos4.4
 A.powerpc-apple-darwin8.7.0
 A.i386-pc-linux-fc6
 A.i386-apple-darwin8.8.1
+A.ia64-hp-hpux11.23

diff --git a/ChangeLog b/ChangeLog
index 59c58252c40c213db6a87f864ec3f76177930f2b..4493bcb73c6fc8930bb4d93bdbb4ef9ba975c8e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2006-12-27  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * minor new port: ia64-hp-hpux11.23
+
+       * m4/macros/check_libwrap_severity.m4 (LIBS): also test if caller
+       needs to define rfc931_timeout.
+
+       * amd/sun2amd.c: define rfc931_timeout and allow/deny_severity for
+       libwrap.
+
+       * amd/amq_svc.c: some versions of libwrap require the caller to
+       define rfc931_timeout in addition to allow/deny_severity.
+
+       * amd/amfs_toplvl.c (amfs_toplvl_init): properly detect when
+       forced unmount functionality exists for all systems.
+
+       * libamu/mount_fs.c (compute_nfs_args): reset nfs_args_t->pathconf
+       only if field exists.
+
+       * conf/nfs_prot/nfs_prot_hpux11.h: prevent HPUX 11.23 from
+       including <tiuser> or <sys/tiuser> (TLI definitions are already
+       included from elsewhere).
+
+       * configure.in: detect nfs_args_t->pathconf field.
+
 2006-11-27  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * doc/Makefile.am: properly publish html files using newer

diff --git a/NEWS b/NEWS
index 1b9ba6724d4da03f77201055ee1afd1daa1cfc25..079d2b8b4eda5a44267ce63ecd3321dfa6d85e7e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
        i386-pc-linux-centos4.4 (RHEL4 clone)
        i386-pc-linux-fc6 (Fedora Core 6)
        i386-pc-solaris2.11-nexentaos (GNU/OpenSolaris)
+       ia64-hp-hpux11.23 (gcc and cc)
        powerpc-apple-darwin8.7.0
 
 

diff --git a/amd/amfs_toplvl.c b/amd/amfs_toplvl.c
index 1b968f197f554ae3fa786a75f8c6eeb0f173c3a3..ae393344f0e8e1e01ff91f0fe22a137e62f45254 100644 (file)
--- a/amd/amfs_toplvl.c
+++ b/amd/amfs_toplvl.c
@@ -148,7 +148,7 @@ amfs_toplvl_init(mntfs *mf)
 {
   int error = 0;
 
-#if defined(MNT2_GEN_OPT_FORCE) || defined(MNT2_GEN_OPT_DETACH)
+#if (defined(MNT2_GEN_OPT_FORCE) || defined(MNT2_GEN_OPT_DETACH)) && (defined(HAVE_UVMOUNT) || defined(HAVE_UMOUNT2))
   if (gopt.flags & CFM_FORCED_UNMOUNTS) {
     plog(XLOG_INFO, "amfs_toplvl_init: trying forced/lazy unmount of %s",
         mf->mf_mount);
@@ -158,7 +158,7 @@ amfs_toplvl_init(mntfs *mf)
     else
       dlog("amfs_toplvl_init: forced/lazy unmount succeeded");
   }
-#endif /* MNT2_GEN_OPT_FORCE || MNT2_GEN_OPT_DETACH */
+#endif /* (MNT2_GEN_OPT_FORCE || MNT2_GEN_OPT_DETACH) && (HAVE_UVMOUNT || HAVE_UMOUNT2) */
   return error;
 }
 

diff --git a/amd/amq_svc.c b/amd/amq_svc.c
index 6fadb160c1215156629684f50d08ce5dbf23bc88..706227a2c236ea42f9cfe820c8ddbd83a35057c1 100644 (file)
--- a/amd/amq_svc.c
+++ b/amd/amq_svc.c
@@ -57,7 +57,7 @@ typedef char *(*amqsvcproc_t)(voidp, struct svc_req *);
  * in libwrap, while others don't: so I need to know precisely iff
  * to define these two severity variables.
  */
-int allow_severity=0, deny_severity=0;
+int allow_severity=0, deny_severity=0, rfc931_timeout=0;
 # endif /* NEED_LIBWRAP_SEVERITY_VARIABLES */
 
 /*

diff --git a/amd/sun2amd.c b/amd/sun2amd.c
index 20bd06f3113791a7e2f1c01cc2d98e68cfb1b330..ed4c5e36a8adcd5f80cf234c2f900868216bb5c8 100644 (file)
--- a/amd/sun2amd.c
+++ b/amd/sun2amd.c
@@ -56,6 +56,16 @@
 
 /* dummies to make the program compile and link */
 struct amu_global_options gopt;
+#if defined(HAVE_TCPD_H) && defined(HAVE_LIBWRAP)
+# ifdef NEED_LIBWRAP_SEVERITY_VARIABLES
+/*
+ * Some systems that define libwrap already define these two variables
+ * in libwrap, while others don't: so I need to know precisely iff
+ * to define these two severity variables.
+ */
+int allow_severity=0, deny_severity=0, rfc931_timeout=0;
+# endif /* NEED_LIBWRAP_SEVERITY_VARIABLES */
+#endif /* defined(HAVE_TCPD_H) && defined(HAVE_LIBWRAP) */
 
 
 /*

diff --git a/conf/nfs_prot/nfs_prot_hpux11.h b/conf/nfs_prot/nfs_prot_hpux11.h
index e103ccda6ba0cf7ccad7762cb43f72314d5863c0..9e585f015a8870a40ed5ed30355b599a27ad0b8c 100644 (file)
--- a/conf/nfs_prot/nfs_prot_hpux11.h
+++ b/conf/nfs_prot/nfs_prot_hpux11.h
@@ -53,6 +53,12 @@
 #ifndef _TIUSER_H
 # define _TIUSER_H
 #endif /* TIUSER_H */
+#ifndef _TIUSER_INCLUDED
+# define _TIUSER_INCLUDED
+#endif /* TIUSER_INCLUDED */
+#ifndef _SYS_TIUSER_INCLUDED
+# define _SYS_TIUSER_INCLUDED
+#endif /* _SYS_TIUSER_INCLUDED */
 /* if T_NULL is defined, undefine it due to a conflict with <arpa/nameser.h> */
 #ifdef T_NULL
 # undef T_NULL

diff --git a/configure.in b/configure.in
index 3912822020b8ec51e064386b0b474533e0cc47f5..2bbcd97e61aa4198f91b00d3454d6029d062f658 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,7 @@ AH_BOTTOM([
 dnl
 dnl AC_CONFIG_AUX_DIR(m4)
 AC_PREREQ(2.52)
-AC_REVISION($Revision: 1.128 $)
+AC_REVISION($Revision: 1.129 $)
 AC_COPYRIGHT([Copyright (c) 1997-2006 Erez Zadok])
 dnl find out system type
 AC_MSG_NOTICE(*** SYSTEM TYPES ***)
@@ -906,6 +906,7 @@ AMU_CHECK_FIELD(nfs_args_t.fhsize)
 AMU_CHECK_FIELD(nfs_args_t.gfs_flags)
 AMU_CHECK_FIELD(nfs_args_t.namlen)
 AMU_CHECK_FIELD(nfs_args_t.optstr)
+AMU_CHECK_FIELD(nfs_args_t.pathconf)
 AMU_CHECK_FIELD(nfs_args_t.proto)
 AMU_CHECK_FIELD(nfs_args_t.sotype)
 AMU_CHECK_FIELD(nfs_args_t.version)

diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c
index 425fa4091ab56bc87965e6ae5296262f95f7f7e8..fcb21b93fe729572ee7085e1f269461e15596868 100644 (file)
--- a/libamu/mount_fs.c
+++ b/libamu/mount_fs.c
@@ -753,7 +753,9 @@ compute_nfs_args(nfs_args_t *nap,
 #if defined(MNT2_NFS_OPT_POSIX) && defined(MNTTAB_OPT_POSIX)
   if (amu_hasmntopt(mntp, MNTTAB_OPT_POSIX) != NULL) {
     nap->flags |= MNT2_NFS_OPT_POSIX;
+# ifdef HAVE_NFS_ARGS_T_PATHCONF
     nap->pathconf = NULL;
+# endif /* HAVE_NFS_ARGS_T_PATHCONF */
   }
 #endif /* MNT2_NFS_OPT_POSIX && MNTTAB_OPT_POSIX */
 

diff --git a/m4/macros/check_libwrap_severity.m4 b/m4/macros/check_libwrap_severity.m4
index 2376abccea734a33bbbd7c051fc841a5dbe48e6b..955ba55ab9d02dab1380fa6ddf418e174489f8d0 100644 (file)
--- a/m4/macros/check_libwrap_severity.m4
+++ b/m4/macros/check_libwrap_severity.m4
@@ -18,7 +18,7 @@ int main()
 # run program two with defining our own severity variables
 AC_TRY_RUN(
 [
-int deny_severity, allow_severity;
+int deny_severity, allow_severity, rfc931_timeout;
 int main()
 {
    exit(0);