[autofs/f16] - update fix-improve-mount-location-error-reporting patch to current patch.

[Ian Kent]

commit abe8e4b83856ded2dd8561fe81b05a1a665bcdc4
Author: Ian Kent <raven at themaw.net>
Date:   Mon Jan 23 07:37:16 2012 +0800

    - update fix-improve-mount-location-error-reporting patch to current patch.

 ....0.6-fix-fix-wait-for-master-source-mutex.patch |   10 +++-----
 ...ix-improve-mount-location-error-reporting.patch |   23 +++++++++----------
 2 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/autofs-5.0.6-fix-fix-wait-for-master-source-mutex.patch b/autofs-5.0.6-fix-fix-wait-for-master-source-mutex.patch
index 9e6d74c..5d0036d 100644
--- a/autofs-5.0.6-fix-fix-wait-for-master-source-mutex.patch
+++ b/autofs-5.0.6-fix-fix-wait-for-master-source-mutex.patch
@@ -12,14 +12,12 @@ avoid false positive fails.
 ---
 
  lib/master.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 
-diff --git a/lib/master.c b/lib/master.c
-index 87d1269..aad9087 100644
---- a/lib/master.c
-+++ b/lib/master.c
-@@ -552,7 +552,7 @@ void master_source_writelock(struct master_mapent *entry)
+--- autofs-5.0.6.orig/lib/master.c
++++ autofs-5.0.6/lib/master.c
+@@ -552,7 +552,7 @@ void master_source_writelock(struct mast
  
  void master_source_readlock(struct master_mapent *entry)
  {
diff --git a/autofs-5.0.6-fix-improve-mount-location-error-reporting.patch b/autofs-5.0.6-fix-improve-mount-location-error-reporting.patch
index 4e58b9e..22ac8fc 100644
--- a/autofs-5.0.6-fix-improve-mount-location-error-reporting.patch
+++ b/autofs-5.0.6-fix-improve-mount-location-error-reporting.patch
@@ -5,13 +5,13 @@ From: Ian Kent <raven at themaw.net>
 The validate_location() function is meant to check for a small subset
 of map location errors only but the "improve mount location error
 reporting" patch inverted a logic test which has made the scope of
-the testing greater causing false positive fails. So add a check for
-those special cases.
+the test greater causing false positive fails. So add a check for
+those special cases and return success instead.
 ---
 
  CHANGELOG           |    1 +
- modules/parse_sun.c |   15 +++++++++++++++
- 2 files changed, 16 insertions(+)
+ modules/parse_sun.c |   14 ++++++++++++++
+ 2 files changed, 15 insertions(+)
 
 
 --- autofs-5.0.6.orig/CHANGELOG
@@ -26,10 +26,11 @@ those special cases.
  -----------------------
 --- autofs-5.0.6.orig/modules/parse_sun.c
 +++ autofs-5.0.6/modules/parse_sun.c
-@@ -868,6 +868,21 @@ static int validate_location(unsigned in
+@@ -868,6 +868,20 @@ static int validate_location(unsigned in
  	 * have ":", "[" and "]".
  	 */
  	if (!check_colon(ptr)) {
++		char *esc;
 +		/*
 +		 * Don't forget cases where a colon is present but
 +		 * not followed by a "/" or, if there is no colon at
@@ -37,13 +38,11 @@ those special cases.
 +		 * it may be a map name by itself, for example.
 +		 */
 +		if (!strchr(ptr, ':') ||
-+		    !strncmp(name, "file:", 5) ||
-+		    !strncmp(name, "yp:", 3) ||
-+		    !strncmp(name, "nis:", 4) ||
-+		    !strncmp(name, "nisplus:", 8) ||
-+		    !strncmp(name, "ldap:", 5) ||
-+		    !strncmp(name, "ldaps:", 6) ||
-+		    !strncmp(name, "dir:", 4))
++		    ((esc = strchr(ptr, '\\')) && *(esc + 1) == ':') ||
++		    !strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) ||
++		    !strncmp(ptr, "nis:", 4) || !strncmp(ptr, "nisplus:", 8) ||
++		    !strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) ||
++		    !strncmp(ptr, "dir:", 4))
 +			return 1;
  		error(logopt,
  		      "expected colon delimeter not found in location %s",