merge in new release

[unix-history] / usr / src / usr.sbin / amd / config / Makefile.config

diff --git a/usr/src/usr.sbin/amd/config/Makefile.config b/usr/src/usr.sbin/amd/config/Makefile.config
index ae663a0..0fedacc 100644 (file)
--- a/usr/src/usr.sbin/amd/config/Makefile.config
+++ b/usr/src/usr.sbin/amd/config/Makefile.config
@@ -1,17 +1,6 @@
+#      @(#)Makefile.config     5.5 (Berkeley) %G%

 #
 #

-# $Id: Makefile.config,v 5.2.1.4 91/03/03 20:54:39 jsp Alpha $
-#
-# Copyright (c) 1990 Jan-Simon Pendry
-# Copyright (c) 1990 Imperial College of Science, Technology & Medicine
-# Copyright (c) 1990 The Regents of the University of California.
-# All rights reserved.
-#
-# This code is derived from software contributed to Berkeley by
-# Jan-Simon Pendry at Imperial College, London.
-#
-# %sccs.include.redist.sh%
-#
-#      @(#)Makefile.config     5.2 (Berkeley) %G%
+# $Id: Makefile.config,v 5.2.2.1 1992/02/09 15:11:17 jsp beta $

 #
 
 #
 #
 
 #


@@ -52,7 +41,7 @@
 # Also define HAS_NIS_RELOAD to include map
 # enumeration code implementing "cache:=all"
 #
 # Also define HAS_NIS_RELOAD to include map
 # enumeration code implementing "cache:=all"
 #

-HAS_NIS_MAPS = -DHAS_NIS_MAPS -DHAS_NIS_RELOAD
+#HAS_NIS_MAPS = -DHAS_NIS_MAPS -DHAS_NIS_RELOAD

 
 #
 # Include support for file maps
 
 #
 # Include support for file maps


@@ -88,9 +77,15 @@ HAS_UNION_MAPS = -DHAS_UNION_MAPS
 #
 HAS_REGEXP = -DHAS_REGEXP
 
 #
 HAS_REGEXP = -DHAS_REGEXP
 

+#
+# Make sure that the hostname passed in RPC authentication packets
+# contains a fully qualified domain name.  See nfs_ops.c
+#
+#HAS_NFS_QUALIFIED_NAMES = -DHAS_NFS_QUALIFIED_NAMES
+

 ##############################################################
 # Do NOT edit the following lines
 #
 CONFIG = ${XINCLUDE} ${HAS_NIS_MAPS} ${HAS_FILE_MAPS} ${HAS_HESIOD_MAPS} \
                ${HAS_NDBM_MAPS} ${HAS_MOUNTD_MAPS} ${HAS_PASSWD_MAPS} ${HAS_UNION_MAPS} \
 ##############################################################
 # Do NOT edit the following lines
 #
 CONFIG = ${XINCLUDE} ${HAS_NIS_MAPS} ${HAS_FILE_MAPS} ${HAS_HESIOD_MAPS} \
                ${HAS_NDBM_MAPS} ${HAS_MOUNTD_MAPS} ${HAS_PASSWD_MAPS} ${HAS_UNION_MAPS} \

-               ${HAS_REGEXP}
+               ${HAS_REGEXP} ${HAS_NFS_QUALIFIED_NAMES}