Virgin import of AMD (am-utils) v6.0.2s2

2 files changed, 24 insertions, 13 deletions

diff --git a/contrib/amd/libamu/mount_fs.c b/contrib/amd/libamu/mount_fs.c
index 3556f8e..eb9f8b1 100644
--- a/contrib/amd/libamu/mount_fs.c
+++ b/contrib/amd/libamu/mount_fs.c
@@ -38,7 +38,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * $Id: mount_fs.c,v 1.7 1999/08/22 21:12:33 ezk Exp $
+ * $Id: mount_fs.c,v 1.8 1999/09/18 08:38:06 ezk Exp $
  *
  */
 
@@ -156,6 +156,9 @@ compute_automounter_mount_flags(mntent_t *mntp)
 #ifdef MNT2_GEN_OPT_IGNORE
   flags |= MNT2_GEN_OPT_IGNORE;
 #endif /* not MNT2_GEN_OPT_IGNORE */
+#ifdef MNT2_GEN_OPT_AUTOMNTFS
+  flags |= MNT2_GEN_OPT_AUTOMNTFS;
+#endif /* not MNT2_GEN_OPT_AUTOMNTFS */
 
   return flags;
 }
@@ -728,7 +731,8 @@ compute_automounter_nfs_args(nfs_args_t *nap, mntent_t *mntp)
 #endif /* MNT2_NFS_OPT_SYMTTL */
 
   /*
-   * This completes the flags for the HIDE_MOUNT_TYPE code above.
+   * This completes the flags for the HIDE_MOUNT_TYPE  code in the
+   * mount_amfs_toplvl() function in amd/amfs_toplvl.c.
    * Some systems don't have a mount type, but a mount flag.
    */
 #ifdef MNT2_NFS_OPT_AUTO
@@ -737,6 +741,9 @@ compute_automounter_nfs_args(nfs_args_t *nap, mntent_t *mntp)
 #ifdef MNT2_NFS_OPT_IGNORE
   nap->flags |= MNT2_NFS_OPT_IGNORE;
 #endif /* MNT2_NFS_OPT_IGNORE */
+#ifdef MNT2_GEN_OPT_AUTOMNTFS
+  nap->flags |= MNT2_GEN_OPT_AUTOMNTFS;
+#endif /* not MNT2_GEN_OPT_AUTOMNTFS */
 
 #ifdef MNT2_NFS_OPT_DUMBTIMR
   /*
@@ -888,27 +895,27 @@ print_nfs_args(const nfs_args_t *nap, u_long nfs_version)
   plog(XLOG_DEBUG, "NA->sotype = %d", nap->sotype);
 #endif /* HAVE_FIELD_NFS_ARGS_T_SOTYPE */
 #ifdef HAVE_FIELD_NFS_ARGS_T_PROTO
-  plog(XLOG_DEBUG, "NA->proto = %d", nap->proto);
+  plog(XLOG_DEBUG, "NA->proto = %d", (int) nap->proto);
 #endif /* HAVE_FIELD_NFS_ARGS_T_PROTO */
 #ifdef HAVE_FIELD_NFS_ARGS_T_VERSION
   plog(XLOG_DEBUG, "NA->version = %d", nap->version);
 #endif /* HAVE_FIELD_NFS_ARGS_T_VERSION */
 
-  plog(XLOG_DEBUG, "NA->flags = 0x%x", nap->flags);
+  plog(XLOG_DEBUG, "NA->flags = 0x%x", (int) nap->flags);
 
-  plog(XLOG_DEBUG, "NA->rsize = %d", nap->rsize);
-  plog(XLOG_DEBUG, "NA->wsize = %d", nap->wsize);
+  plog(XLOG_DEBUG, "NA->rsize = %d", (int) nap->rsize);
+  plog(XLOG_DEBUG, "NA->wsize = %d", (int) nap->wsize);
 #ifdef HAVE_FIELD_NFS_ARGS_T_BSIZE
   plog(XLOG_DEBUG, "NA->bsize = %d", nap->bsize);
 #endif /* HAVE_FIELD_NFS_ARGS_T_BSIZE */
-  plog(XLOG_DEBUG, "NA->timeo = %d", nap->timeo);
-  plog(XLOG_DEBUG, "NA->retrans = %d", nap->retrans);
+  plog(XLOG_DEBUG, "NA->timeo = %d", (int) nap->timeo);
+  plog(XLOG_DEBUG, "NA->retrans = %d", (int) nap->retrans);
 
 #ifdef HAVE_FIELD_NFS_ARGS_T_ACREGMIN
-  plog(XLOG_DEBUG, "NA->acregmin = %d", nap->acregmin);
-  plog(XLOG_DEBUG, "NA->acregmax = %d", nap->acregmax);
-  plog(XLOG_DEBUG, "NA->acdirmin = %d", nap->acdirmin);
-  plog(XLOG_DEBUG, "NA->acdirmax = %d", nap->acdirmax);
+  plog(XLOG_DEBUG, "NA->acregmin = %d", (int) nap->acregmin);
+  plog(XLOG_DEBUG, "NA->acregmax = %d", (int) nap->acregmax);
+  plog(XLOG_DEBUG, "NA->acdirmin = %d", (int) nap->acdirmin);
+  plog(XLOG_DEBUG, "NA->acdirmax = %d", (int) nap->acdirmax);
 #endif /* HAVE_FIELD_NFS_ARGS_T_ACREGMIN */
 #ifdef MNTTAB_OPT_SYMTTL
   plog(XLOG_DEBUG, "NA->symttl = %d", nap->symttl);
diff --git a/contrib/amd/libamu/xutil.c b/contrib/amd/libamu/xutil.c
index 5ba4938..bd1bcf5 100644
--- a/contrib/amd/libamu/xutil.c
+++ b/contrib/amd/libamu/xutil.c
@@ -422,13 +422,17 @@ real_plog(int lvl, char *fmt, va_list vargs)
 
   expand_error(fmt, efmt, 1024);
 
+#ifdef HAVE_VSNPRINTF
+  vsnprintf(ptr, 1024, efmt, vargs);
+#else /* not HAVE_VSNPRINTF */
   /*
    * XXX: ptr is 1024 bytes long.  It is possible to write into it
    * more than 1024 bytes, if efmt is already large, and vargs expand
-   * as well.
+   * as well.  This is not as safe as using vsnprintf().
    */
   vsprintf(ptr, efmt, vargs);
   msg[1023] = '\0';		/* null terminate, to be sure */
+#endif /* not HAVE_VSNPRINTF */
 
   ptr += strlen(ptr);
   if (ptr[-1] == '\n')