From 13e9b40b3c1ae31a1a8c0175de371b4cce306f28 Mon Sep 17 00:00:00 2001
From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 17 Jun 2005 00:23:41 +0000
Subject: [PATCH] * amd/mapc.c (maptypes): move MAP_EXEC after MAP_FILE,
 because exec maps will always match when users use amd with command line args
 (not amd.conf).  Using that legacy way, unfortunately, means that Amd will
 use it's hard-coded info-service search path, which doesn't work for
 everyone.  It's much better to use amd.conf and specify what you want
 exactly.

---
 ChangeLog  |  9 +++++++++
 amd/mapc.c | 24 ++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f5708e7..d046d2a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-06-16  Erez Zadok  <ezk@cs.sunysb.edu>
+
+	* amd/mapc.c (maptypes): move MAP_EXEC after MAP_FILE, because
+	exec maps will always match when users use amd with command line
+	args (not amd.conf).  Using that legacy way, unfortunately, means
+	that Amd will use it's hard-coded info-service search path, which
+	doesn't work for everyone.  It's much better to use amd.conf and
+	specify what you want exactly.
+
 2005-06-15  Erez Zadok  <ezk@cs.sunysb.edu>
 
 	* minor new port: i386-pc-linux-fc4 (gcc4 catches more bugs).
diff --git a/amd/mapc.c b/amd/mapc.c
index d21c8dc9..f993177e 100644
--- a/amd/mapc.c
+++ b/amd/mapc.c
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *
- * $Id: mapc.c,v 1.27 2005/03/19 03:05:25 ezk Exp $
+ * $Id: mapc.c,v 1.28 2005/06/17 00:23:41 ezk Exp $
  *
  */
 
@@ -301,17 +301,6 @@ static map_type maptypes[] =
     MAPC_INC
   },
 #endif /* HAVE_MAP_NDBM */
-#ifdef HAVE_MAP_EXEC
-  {
-    "exec",
-    exec_init,
-    error_reload,
-    NULL,			/* isup function */
-    exec_search,
-    error_mtime,
-    MAPC_INC
-  },
-#endif /* HAVE_MAP_EXEC */
 #ifdef HAVE_MAP_FILE
   {
     "file",
@@ -323,6 +312,17 @@ static map_type maptypes[] =
     MAPC_ALL
   },
 #endif /* HAVE_MAP_FILE */
+#ifdef HAVE_MAP_EXEC
+  {
+    "exec",
+    exec_init,
+    error_reload,
+    NULL,			/* isup function */
+    exec_search,
+    error_mtime,
+    MAPC_INC
+  },
+#endif /* HAVE_MAP_EXEC */
   {
     "error",
     error_init,
-- 
2.43.0