* amd/sum_map_tok.l: Fixed a bug in a regular expression that

prevented dashes in hostnames.  This was posted in BZ by Thomas
A. Fine.

* README.sun2amd: Fixed a typo.  Sentence mentions use of autofs
type when it should be host type.

diff --git a/ChangeLog b/ChangeLog
index 7487244716fec2c57b3456f98a8c0d2f332b99e7..b6d01eb4c1510c0e5eea09d33a1403c6ae390ee9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-16  Daniel P. Ottavio  <ottavio@vm.fsl.cs.sunysb.edu>
+
+       * amd/sum_map_tok.l: Fixed a bug in a regular expression that
+       prevented dashes in hostnames.  This was posted in BZ by Thomas
+       A. Fine.
+
+       * README.sun2amd: Fixed a typo.  Sentence mentions use of autofs
+       type when it should be host type.
+
 2006-01-04  Erez Zadok  <ezk@cs.sunysb.edu>
 
        * doc/am-utils.texi (auto_attrcache Parameter): revise discussion

diff --git a/README.sun2amd b/README.sun2amd
index 762e53d9105a411a8ec5ba4db4a5cb4a92d92a6e..6c397bd0e0236ad72303fc0c9ad4ac8e89fdc3b3 100644 (file)
--- a/README.sun2amd
+++ b/README.sun2amd
@@ -123,7 +123,7 @@ stdout (i.e., traditional Unix filter).
 Q1: I know "/net" is not supported, but how can I achieve the same
     functionality with Amd?
 
-A1: In short, you must create the '/net' entry as a Amd entry of type autofs
+A1: In short, you must create the '/net' entry as a Amd entry of type host
     by hand.  Below is an example of how to do this.  See the Amd
     documentation on type autofs for more information.
 

diff --git a/amd/sun_map_tok.l b/amd/sun_map_tok.l
index 868bbc31764f87de187eb14bb3e8c7d2742d6151..55aadebfecb94e20c5897cbfe40739ef28810b9c 100644 (file)
--- a/amd/sun_map_tok.l
+++ b/amd/sun_map_tok.l
@@ -144,7 +144,7 @@ int sun_map_tokpos = 1;
 /* allocate more output slots so lex scanners don't run out of mem */
 %o 1024
 
-WORD_REX       [A-Za-z0-9_/&\.$=]+
+WORD_REX       [A-Za-z0-9_/&\.$=]+[A-Za-z0-9_/&\.$=-]*
 COMMENT_REX    ^#.*\n
 WSPACE_REX     [ \t]*
 NEWLINE_REX    [ \t]*\n