Ian Kent c79aa4
autofs-5.0.3 - map type in map name fix
Ian Kent c79aa4
Ian Kent c79aa4
From: Ian Kent <raven@themaw.net>
Ian Kent c79aa4
Ian Kent c79aa4
Fix incorrect match of map type as a host name.
Ian Kent c79aa4
Actually the original patch didn't match upstream or RHEL
Ian Kent c79aa4
so this syncs the source with those. It appears the problem
Ian Kent c79aa4
was fixed here some time ago but slightly differently.
Ian Kent c79aa4
---
Ian Kent c79aa4
Ian Kent c79aa4
 lib/master_tok.l |    4 +++-
Ian Kent c79aa4
 1 file changed, 3 insertions(+), 1 deletion(-)
Ian Kent c79aa4
Ian Kent c79aa4
Ian Kent c79aa4
--- autofs-5.0.3.orig/lib/master_tok.l
Ian Kent c79aa4
+++ autofs-5.0.3/lib/master_tok.l
Ian Kent c79aa4
@@ -202,7 +202,9 @@ OPTNTOUT	(-n{OPTWS}|-n{OPTWS}={OPTWS}|--
Ian Kent c79aa4
 		}
Ian Kent c79aa4
 	}
Ian Kent c79aa4
 
Ian Kent c79aa4
-	{MTYPE}/({DNSERVERSTR}|{DNATTRSTR}=)? {
Ian Kent c79aa4
+	{MTYPE} |
Ian Kent c79aa4
+	{MTYPE}/{DNSERVERSTR}{DNATTRSTR} |
Ian Kent c79aa4
+	{MTYPE}/{DNATTRSTR}= {
Ian Kent c79aa4
 		tlen = master_leng - 1;
Ian Kent c79aa4
 		if (bptr != buff && isblank(master_text[tlen])) {
Ian Kent c79aa4
 			strncat(buff, master_text, tlen);