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

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

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

description:
pull up rev 1.7 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/conf.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 64d0b6b98282 -r 353fc065306c usr.sbin/amd/amd/conf.c
--- a/usr.sbin/amd/amd/conf.c   Tue Sep 21 04:54:59 1999 +0000
+++ b/usr.sbin/amd/amd/conf.c   Tue Sep 21 04:55:04 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.6 1999/02/01 19:05:09 christos Exp $        */
+/*     $NetBSD: conf.c,v 1.6.2.1 1999/09/21 04:55:04 cgd Exp $ */
 
 /*
  * Copyright (c) 1997-1999 Erez Zadok
@@ -40,7 +40,7 @@
  *
  *      %W% (Berkeley) %G%
  *
- * Id: conf.c,v 1.3 1999/01/10 21:53:44 ezk Exp 
+ * Id: conf.c,v 1.4 1999/02/04 07:24:15 ezk Exp 
  *
  */
 
@@ -552,6 +552,7 @@
   if (STREQ(val, "autofs")) {
 #ifdef HAVE_FS_AUTOFS
     gopt.flags |= CFM_MOUNT_TYPE_AUTOFS;
+    amd_use_autofs++;
     return 0;
 #else /* not HAVE_FS_AUTOFS */
     fprintf(stderr, "conf: no autofs support available\n");
@@ -869,6 +870,7 @@
   if (STREQ(val, "autofs")) {
 #ifdef HAVE_FS_AUTOFS
     cfm->cfm_flags |= CFM_MOUNT_TYPE_AUTOFS;
+    amd_use_autofs++;
     return 0;
 #else /* not HAVE_FS_AUTOFS */
     fprintf(stderr, "conf: no autofs support available\n");