From: Erez Zadok Date: Thu, 28 Dec 2006 02:27:51 +0000 (+0000) Subject: * minor new port: ia64-hp-hpux11.23 X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=fefd6dc89dbbe8b43788ae115f5cfe88c940407a;p=am-utils-6.0.git * 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 or (TLI definitions are already included from elsewhere). * configure.in: detect nfs_args_t->pathconf field. --- diff --git a/.cvsignore b/.cvsignore index b9bcaad..b27329b 100644 --- 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 59c5825..4493bcb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +2006-12-27 Erez Zadok + + * 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 or (TLI definitions are already + included from elsewhere). + + * configure.in: detect nfs_args_t->pathconf field. + 2006-11-27 Erez Zadok * doc/Makefile.am: properly publish html files using newer diff --git a/NEWS b/NEWS index 1b9ba67..079d2b8 100644 --- 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 1b968f1..ae39334 100644 --- 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 6fadb16..706227a 100644 --- 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 20bd06f..ed4c5e3 100644 --- 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 e103ccd..9e585f0 100644 --- 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 */ #ifdef T_NULL # undef T_NULL diff --git a/configure.in b/configure.in index 3912822..2bbcd97 100644 --- 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 425fa40..fcb21b9 100644 --- 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 2376abc..955ba55 100644 --- 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);