rpms/autofs/devel autofs-5.0.1-rc2-ldap-noexist-rmdir.patch, NONE, 1.1 autofs-5.0.1-rc2-replicated-close-sock.patch, NONE, 1.1 autofs.spec, 1.147, 1.148

[fedora-cvs-commits at redhat.com]

Author: ikent

Update of /cvs/dist/rpms/autofs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv21701

Modified Files:
	autofs.spec 
Added Files:
	autofs-5.0.1-rc2-ldap-noexist-rmdir.patch 
	autofs-5.0.1-rc2-replicated-close-sock.patch 
Log Message:
* Mon Sep 25 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.5
- fix LDAP lookup delete cache entry only if entry doesn't exist.
- add missing socket close in replicated host check (Jeff Moyer).


autofs-5.0.1-rc2-ldap-noexist-rmdir.patch:
 CHANGELOG             |    1 +
 modules/lookup_ldap.c |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE autofs-5.0.1-rc2-ldap-noexist-rmdir.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index c98f14e..07c8e96 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@
 - fix handling of autofs specific mount options.
 - fix include check full patch for file map of same name.
 - fix cache entrys not being cleaned up on submount expire.
+- fix LDAP lookup delete cache entry only if entry doesn't exist. 
 
 1/9/2006 autofs-5.0.1 rc2
 -------------------------
diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
index b63539e..277e2d6 100644
--- a/modules/lookup_ldap.c
+++ b/modules/lookup_ldap.c
@@ -1546,7 +1546,7 @@ static int check_map_indirect(struct aut
 			need_map = 1;
 	}
 
-	if (ret == CHE_MISSING) {
+	if (ret == CHE_MISSING && exists) {
 		pthread_cleanup_push(cache_lock_cleanup, mc);
 		cache_writelock(mc);
 		if (cache_delete(mc, key))

autofs-5.0.1-rc2-replicated-close-sock.patch:
 CHANGELOG            |    1 +
 modules/replicated.c |    1 +
 2 files changed, 2 insertions(+)

--- NEW FILE autofs-5.0.1-rc2-replicated-close-sock.patch ---
diff --git a/CHANGELOG b/CHANGELOG
index 07c8e96..784a648 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@
 - fix include check full patch for file map of same name.
 - fix cache entrys not being cleaned up on submount expire.
 - fix LDAP lookup delete cache entry only if entry doesn't exist. 
+- add missing socket close in replicated host check (Jeff Moyer).
 
 1/9/2006 autofs-5.0.1 rc2
 -------------------------
diff --git a/modules/replicated.c b/modules/replicated.c
index 7558383..9336cf8 100644
--- a/modules/replicated.c
+++ b/modules/replicated.c
@@ -149,6 +149,7 @@ static unsigned int get_proximity(const 
 			if (ret == -1) {
 				char *estr = strerror_r(errno, buf, MAX_ERR_BUF);
 				error(LOGOPT_ANY, "ioctl: %s", estr);
+				close(sock);
 				return PROXIMITY_ERROR;
 			}
 


Index: autofs.spec
===================================================================
RCS file: /cvs/dist/rpms/autofs/devel/autofs.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- autofs.spec	20 Sep 2006 07:58:16 -0000	1.147
+++ autofs.spec	25 Sep 2006 15:26:54 -0000	1.148
@@ -4,7 +4,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems.
 Name: autofs
 %define version 5.0.1
-%define release 0.rc2.4
+%define release 0.rc2.5
 Version: %{version}
 Release: %{release}
 Epoch: 1
@@ -14,6 +14,8 @@
 Patch0: autofs-5.0.1-rc2-handle-autofs-options.patch
 Patch1: autofs-5.0.1-rc2-include-check-full-path.patch
 Patch2: autofs-5.0.1-rc2-submount-cache-clean.patch
+Patch3: autofs-5.0.1-rc2-ldap-noexist-rmdir.patch
+Patch4: autofs-5.0.1-rc2-replicated-close-sock.patch
 Buildroot: /var/tmp/autofs-tmp
 BuildRequires: autoconf, hesiod-devel, openldap-devel, bison, flex, libxml2-devel, cyrus-sasl-devel, openssl-devel
 Prereq: chkconfig
@@ -112,6 +114,10 @@
 %{_libdir}/autofs/*
 
 %changelog
+* Mon Sep 25 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.5
+- fix LDAP lookup delete cache entry only if entry doesn't exist.
+- add missing socket close in replicated host check (Jeff Moyer).
+
 * Wed Sep 20 2006 Ian Kent <ikent at redhat.com> - 5.0.1-0.rc2.4
 - fix cache entrys not being cleaned up on submount expire.