* scripts/amd2ldif.in: patch to add the amdMapName attribute to

the amdMapTimestamp object when amd2ldif converts it.  This is
necessary if you are using type:=auto mounts and want those
mountmaps looked up through LDAP.  Patch from Jim Zajkowski
<jim.zajkowski@gmail.com>.

* m4/macros/*.m4: properly quote AC_DEFUN'ed macro name, and fix
regexp/patsubst M4 commands.  Newer versions of autoconf (e.g.,
v2.59) complain about those.

diff --git a/AUTHORS b/AUTHORS
index 8ff68cb9659f29d1b514c54e130aaa3afd9175eb..e495cd7a431f151bd283cd10cea169739987ba8e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -409,3 +409,6 @@ terminates properly even mtab file doesn't exist.
 
 * Erik Kline <ekline at ekline dot com>
 January 3, 2005: implementation of executable maps for Amd.
+
+* Jim Zajkowski <jim.zajkowski@gmail.com>
+March 14, 2005: small patch to amd2ldif.

diff --git a/ChangeLog b/ChangeLog
index fc7a929fd8d125e3a6f902046d31494fd513b5fc..56edc4f584f08e3a0c14455e9dabbc79ddfeb130 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-03-14  Erez Zadok  <ezk@cs.sunysb.edu>
+
+       * scripts/amd2ldif.in: patch to add the amdMapName attribute to
+       the amdMapTimestamp object when amd2ldif converts it.  This is
+       necessary if you are using type:=auto mounts and want those
+       mountmaps looked up through LDAP.  Patch from Jim Zajkowski
+       <jim.zajkowski@gmail.com>.
+
 2005-03-12  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * minor new ports: i386-pc-linux-rhel4.
@@ -327,8 +335,9 @@
        * depcomp, install-sh, missing, mkinstalldirs: update from latest
        versions of Automake 1.9.2.
 
-       * m4/macros/*.m4: properly quote AC_DEFUN'ed macro name.  Newer
-       versions of autoconf (e.g., v2.59) complain about those.
+       * m4/macros/*.m4: properly quote AC_DEFUN'ed macro name, and fix
+       regexp/patsubst M4 commands.  Newer versions of autoconf (e.g.,
+       v2.59) complain about those.
 
 2005-02-17  Erez Zadok  <ezk@cs.sunysb.edu>
 

diff --git a/scripts/amd2ldif.in b/scripts/amd2ldif.in
index 6d3c28a9b3bf62b8a48ba05134644c9c514b1f12..b8dd690638625c08ef1936f08e4ee3f9b62f0332 100755 (executable)
--- a/scripts/amd2ldif.in
+++ b/scripts/amd2ldif.in
@@ -22,6 +22,7 @@ print "dn: cn=amdmap timestamp, $base\n";
 printf "$tfmt", "cn", "amdmap timestamp";
 printf "$tfmt", "objectClass", "amdmapTimestamp";
 printf "$tfmt", "amdmapTimestamp", $time;
+printf "$tfmt", "amdmapName", $mapname;
 print "\n";
 
 my $line = "";