[src/netbsd-1-4]: src/usr.sbin/amd/amd pull up rev 1.8 from trunk (requested ...

[cgd <cgd%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7eb1d15f391f
branches:  netbsd-1-4
changeset: 469434:7eb1d15f391f
user:      cgd <cgd%NetBSD.org@localhost>
date:      Tue Sep 21 04:55:45 1999 +0000

description:
pull up rev 1.8 from trunk (requested by christos):
  Upgrade amd(8) and related software to fix expoitable stack overflows
  in amq(8), as reported in BUGTRAQ and elsewhere.

diffstat:

 usr.sbin/amd/amd/ops_cdfs.c |  17 +++++++++++++++--
 usr.sbin/amd/amd/ops_nfs.c  |  15 ++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diffs (84 lines):

diff -r 1b081b6eaf4e -r 7eb1d15f391f usr.sbin/amd/amd/ops_cdfs.c
--- a/usr.sbin/amd/amd/ops_cdfs.c       Tue Sep 21 04:55:40 1999 +0000
+++ b/usr.sbin/amd/amd/ops_cdfs.c       Tue Sep 21 04:55:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ops_cdfs.c,v 1.7 1999/02/01 19:05:10 christos Exp $    */
+/*     $NetBSD: ops_cdfs.c,v 1.7.2.1 1999/09/21 04:55:45 cgd Exp $     */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -40,7 +40,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * Id: ops_cdfs.c,v 1.2 1999/01/10 21:53:49 ezk Exp 
+ * Id: ops_cdfs.c,v 1.3 1999/03/30 17:22:46 ezk Exp 
  *
  */
 
@@ -150,6 +150,19 @@
   if (hasmntopt(&mnt, MNTTAB_OPT_RRIP))
     cdfs_flags |= MNT2_CDFS_OPT_RRIP;
 #endif /* defined(MNT2_CDFS_OPT_RRIP) && defined(MNTTAB_OPT_RRIP) */
+#if defined(MNT2_CDFS_OPT_NORRIP) && defined(MNTTAB_OPT_NORRIP)
+  if (hasmntopt(&mnt, MNTTAB_OPT_NORRIP))
+    cdfs_flags |= MNT2_CDFS_OPT_NORRIP;
+#endif /* defined(MNT2_CDFS_OPT_NORRIP) && defined(MNTTAB_OPT_NORRIP) */
+
+#if defined(MNT2_CDFS_OPT_GENS) && defined(MNTTAB_OPT_GENS)
+  if (hasmntopt(&mnt, MNTTAB_OPT_GENS))
+    cdfs_flags |= MNT2_CDFS_OPT_GENS;
+#endif /* defined(MNT2_CDFS_OPT_GENS) && defined(MNTTAB_OPT_GENS) */
+#if defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT)
+  if (hasmntopt(&mnt, MNTTAB_OPT_EXTATT))
+    cdfs_flags |= MNT2_CDFS_OPT_EXTATT;
+#endif /* defined(MNT2_CDFS_OPT_EXTATT) && defined(MNTTAB_OPT_EXTATT) */
 
   genflags = compute_mount_flags(&mnt);
 
diff -r 1b081b6eaf4e -r 7eb1d15f391f usr.sbin/amd/amd/ops_nfs.c
--- a/usr.sbin/amd/amd/ops_nfs.c        Tue Sep 21 04:55:40 1999 +0000
+++ b/usr.sbin/amd/amd/ops_nfs.c        Tue Sep 21 04:55:45 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ops_nfs.c,v 1.7 1999/02/01 19:05:10 christos Exp $     */
+/*     $NetBSD: ops_nfs.c,v 1.7.2.1 1999/09/21 04:55:50 cgd Exp $      */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -40,7 +40,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * Id: ops_nfs.c,v 1.3 1999/01/13 23:31:01 ezk Exp 
+ * Id: ops_nfs.c,v 1.5 1999/03/13 17:03:28 ezk Exp 
  *
  */
 
@@ -587,10 +587,13 @@
     strcpy(host + MAXHOSTNAMELEN - 3, "..");
 #endif /* MAXHOSTNAMELEN */
 
-  if (mf->mf_remopts && *mf->mf_remopts && !islocalnet(fs->fs_ip->sin_addr.s_addr))
+  if (mf->mf_remopts && *mf->mf_remopts &&
+      !islocalnet(fs->fs_ip->sin_addr.s_addr)) {
+    plog(XLOG_INFO, "Using remopts=\"%s\"", mf->mf_remopts);
     xopts = strdup(mf->mf_remopts);
-  else
+  } else {
     xopts = strdup(opts);
+  }
 
   memset((voidp) &mnt, 0, sizeof(mnt));
   mnt.mnt_dir = dir;
@@ -661,8 +664,10 @@
 
   /* finally call the mounting function */
 #ifdef DEBUG
-  amuDebug(D_TRACE)
+  amuDebug(D_TRACE) {
     print_nfs_args(&nfs_args, nfs_version);
+    plog(XLOG_DEBUG, "Generic mount flags 0x%x", genflags);
+  }
 #endif /* DEBUG */
   error = mount_fs(&mnt, genflags, (caddr_t) &nfs_args, retry, type,
                   nfs_version, nfs_proto, mnttab_file_name);