From bde3e2e5c7a47aa9c8b3cdb7ed573d686cdd2084 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Thu, 11 May 2006 17:28:49 +0000 Subject: [PATCH] ******************************************************************* *** Released am-utils-6.1.5 *** ******************************************************************* * Minor new ports: i386-unknown-freebsd6.1 (RELEASE) powerpc-apple-darwin8.6.0, and i386-unknown-openbsd3.9. * libamu/mount_fs.c (compute_nfs_attrcache_flags): fix signedness problems on IRIX-6.5. * conf/autofs/autofs_solaris_v1.c (xdr_umntrequest): fix signedness problems on IRIX-6.5. --- .cvsignore | 3 +++ ChangeLog | 17 +++++++++++++++++ NEWS | 7 ++++++- conf/autofs/autofs_solaris_v1.c | 2 +- libamu/mount_fs.c | 10 ++++++---- vers.m4 | 2 +- 6 files changed, 34 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index a1b6f01..f2e2ea8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -165,3 +165,6 @@ A.i386-unknown-openbsd3.8 A.i386-pc-linux-fc5 A.i386-pc-linux-suse10.1 A.powerpc-apple-darwin8.5.0 +A.i386-unknown-freebsd6.1 +A.powerpc-apple-darwin8.6.0 +A.i386-unknown-openbsd3.9 diff --git a/ChangeLog b/ChangeLog index 12725f0..12f2c5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-05-11 Erez Zadok + + ******************************************************************* + *** Released am-utils-6.1.5 *** + ******************************************************************* + +2006-05-10 Erez Zadok + + * Minor new ports: i386-unknown-freebsd6.1 (RELEASE) + powerpc-apple-darwin8.6.0, and i386-unknown-openbsd3.9. + + * libamu/mount_fs.c (compute_nfs_attrcache_flags): fix signedness + problems on IRIX-6.5. + + * conf/autofs/autofs_solaris_v1.c (xdr_umntrequest): fix + signedness problems on IRIX-6.5. + 2006-05-01 Erez Zadok * configure.in: check if libc already includes dbm functionality diff --git a/NEWS b/NEWS index e47cae6..5cde984 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -*** Notes specific to am-utils version 6.1.5-pre +*** Notes specific to am-utils version 6.1.5 New amd.conf global parameter: nfs_allow_any_interface. By default it is set to 'no' which means that Amd accepts local NFS packets only from @@ -19,6 +19,11 @@ netgrp(,). * detect G/DBM support via gdbm_compat library (Debian) * detect NDBM support in libc (FreeBSD 6) +- minor new ports: + i386-unknown-freebsd6.1 (RELEASE) + i386-unknown-openbsd3.9 + powerpc-apple-darwin8.6.0 + *** Notes specific to am-utils version 6.1.4 Support new mount options for type:=pcfs mounts: longname, nowin95, diff --git a/conf/autofs/autofs_solaris_v1.c b/conf/autofs/autofs_solaris_v1.c index 31ed8ca..843b14a 100644 --- a/conf/autofs/autofs_solaris_v1.c +++ b/conf/autofs/autofs_solaris_v1.c @@ -143,7 +143,7 @@ xdr_umntrequest(XDR *xdrs, umntrequest *objp) if (amuDebug(D_XDRTRACE)) plog(XLOG_DEBUG, "xdr_umntrequest:"); - if (!xdr_int(xdrs, &objp->isdirect)) + if (!xdr_int(xdrs, (int *) &objp->isdirect)) return (FALSE); if (!xdr_u_int(xdrs, (u_int *) &objp->devid)) diff --git a/libamu/mount_fs.c b/libamu/mount_fs.c index 803d66f..74f064e 100644 --- a/libamu/mount_fs.c +++ b/libamu/mount_fs.c @@ -337,7 +337,9 @@ compute_nfs_attrcache_flags(nfs_args_t *nap, mntent_t *mntp) { int acval = 0; int err_acval = 1; /* 1 means we found no 'actimeo' value */ +#if defined(HAVE_NFS_ARGS_T_ACREGMIN) || defined(HAVE_NFS_ARGS_T_ACREGMAX) || defined(HAVE_NFS_ARGS_T_ACDIRMIN) || defined(HAVE_NFS_ARGS_T_ACDIRMAX) int err_acrdmm; /* for ac{reg,dir}{min,max} */ +#endif /* HAVE_NFS_ARGS_T_AC{REG,DIR}{MIN,MAX} */ /************************************************************************/ /*** ATTRIBUTE CACHES ***/ @@ -363,7 +365,7 @@ compute_nfs_attrcache_flags(nfs_args_t *nap, mntent_t *mntp) nap->acregmin = acval; /* min ac timeout for reg files (sec) */ } else { # ifdef MNTTAB_OPT_ACREGMIN - err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACREGMIN, &nap->acregmin); + err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACREGMIN, (int *) &nap->acregmin); # else /* not MNTTAB_OPT_ACREGMIN */ nap->acregmin = 0; # endif /* not MNTTAB_OPT_ACREGMIN */ @@ -382,7 +384,7 @@ compute_nfs_attrcache_flags(nfs_args_t *nap, mntent_t *mntp) nap->acregmax = acval; /* max ac timeout for reg files (sec) */ } else { # ifdef MNTTAB_OPT_ACREGMAX - err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACREGMAX, &nap->acregmax); + err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACREGMAX, (int *) &nap->acregmax); # else /* not MNTTAB_OPT_ACREGMAX */ nap->acregmax = 0; # endif /* not MNTTAB_OPT_ACREGMAX */ @@ -401,7 +403,7 @@ compute_nfs_attrcache_flags(nfs_args_t *nap, mntent_t *mntp) nap->acdirmin = acval; /* min ac timeout for dirs (sec) */ } else { # ifdef MNTTAB_OPT_ACDIRMIN - err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACDIRMIN, &nap->acdirmin); + err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACDIRMIN, (int *) &nap->acdirmin); # else /* not MNTTAB_OPT_ACDIRMIN */ nap->acdirmin = 0; # endif /* not MNTTAB_OPT_ACDIRMIN */ @@ -420,7 +422,7 @@ compute_nfs_attrcache_flags(nfs_args_t *nap, mntent_t *mntp) nap->acdirmax = acval; /* max ac timeout for dirs (sec) */ } else { # ifdef MNTTAB_OPT_ACDIRMAX - err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACDIRMAX, &nap->acdirmax); + err_acrdmm = hasmntvalerr(mntp, MNTTAB_OPT_ACDIRMAX, (int *) &nap->acdirmax); # else /* not MNTTAB_OPT_ACDIRMAX */ nap->acdirmax = 0; # endif /* not MNTTAB_OPT_ACDIRMAX */ diff --git a/vers.m4 b/vers.m4 index 18aceec..7343910 100644 --- a/vers.m4 +++ b/vers.m4 @@ -1 +1 @@ -[6.1.5pre]dnl +[6.1.5]dnl -- 2.43.0