Blob Blame History Raw
autofs-5.0.5 - fix included map read fail handling (again)

From: Ian Kent <raven@themaw.net>

If an included map read fails an error is returned and subsequent
map entries are not read. We should report the failure but we
shouldn't stop reading the map.
---

 CHANGELOG             |    1 +
 modules/lookup_file.c |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)


--- autofs-5.0.5.orig/CHANGELOG
+++ autofs-5.0.5/CHANGELOG
@@ -28,6 +28,7 @@
 - add locality as valid ldap master map attribute.
 - add locality as valid ldap master map attribute fix.
 - add simple bind authentication.
+- fix included map read fail handling (again).
 
 03/09/2009 autofs-5.0.5
 -----------------------
--- autofs-5.0.5.orig/modules/lookup_file.c
+++ autofs-5.0.5/modules/lookup_file.c
@@ -656,8 +656,6 @@ int lookup_read_map(struct autofs_point 
 			if (!status) {
 				warn(ap->logopt,
 				     "failed to read included map %s", key);
-				fclose(f);
-				return NSS_STATUS_UNAVAIL;
 			}
 		} else {
 			char *s_key;