rpms/bind-dyndb-ldap/F-12 bind-dyndb-ldap-bool_case.patch, NONE, 1.1 bind-dyndb-ldap-reconnection.patch, NONE, 1.1 bind-dyndb-ldap.spec, 1.3, 1.4

[Martin Nagy]

Author: mnagy

Update of /cvs/extras/rpms/bind-dyndb-ldap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11429

Modified Files:
	bind-dyndb-ldap.spec 
Added Files:
	bind-dyndb-ldap-bool_case.patch 
	bind-dyndb-ldap-reconnection.patch 
Log Message:
* Mon Nov 30 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.4.a1
- add patches from F-11
- rebuild for new bind


bind-dyndb-ldap-bool_case.patch:
 doc/example.ldif  |    2 +-
 src/ldap_helper.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE bind-dyndb-ldap-bool_case.patch ---
diff -up bind-dyndb-ldap-0.1.0a1/doc/example.ldif.bool_case bind-dyndb-ldap-0.1.0a1/doc/example.ldif
--- bind-dyndb-ldap-0.1.0a1/doc/example.ldif.bool_case	2009-08-31 10:54:25.787684041 +0200
+++ bind-dyndb-ldap-0.1.0a1/doc/example.ldif	2009-08-31 10:54:31.977621770 +0200
@@ -11,7 +11,7 @@ objectClass: idnsZone
 objectClass: idnsRecord
 idnsName: ipatest.com
 idnsUpdatePolicy: grant EXAMPLE.COM krb5-self * A;
-idnsZoneActive: True
+idnsZoneActive: TRUE
 idnsSOAmName: server.example.com
 idnsSOArName: root.server.example.com
 idnsSOAserial: 1
diff -up bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.bool_case bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c
--- bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.bool_case	2009-08-31 10:54:43.770621793 +0200
+++ bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c	2009-08-31 10:54:58.471621645 +0200
@@ -494,7 +494,7 @@ refresh_zones_from_ldap(ldap_db_t *ldap_
 
 	CHECK(ldap_query(ldap_inst, str_buf(ldap_db->base), LDAP_SCOPE_SUBTREE,
 			 attrs, 0,
-			 "(&(objectClass=idnsZone)(idnsZoneActive=True))"));
+			 "(&(objectClass=idnsZone)(idnsZoneActive=TRUE))"));
 	CHECK(cache_query_results(ldap_inst));
 
 	for (entry = HEAD(ldap_inst->ldap_entries);

bind-dyndb-ldap-reconnection.patch:
 ldap_helper.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE bind-dyndb-ldap-reconnection.patch ---
diff -up bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.reconnection bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c
--- bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c.reconnection	2009-09-04 14:45:52.088622308 +0200
+++ bind-dyndb-ldap-0.1.0a1/src/ldap_helper.c	2009-09-04 14:55:25.643684393 +0200
@@ -1521,10 +1521,11 @@ ldap_connect(ldap_instance_t *ldap_inst)
 	LDAP_OPT_CHECK(ret, "failed to set timeout: %s", ldap_err2string(ret));
 	*/
 
+	if (ldap_inst->handle != NULL)
+		ldap_unbind_ext_s(ldap_inst->handle, NULL, NULL);
 	ldap_inst->handle = ld;
-	ldap_reconnect(ldap_inst);
 
-	return ISC_R_SUCCESS;
+	return ldap_reconnect(ldap_inst);
 
 cleanup:
 
@@ -1636,11 +1637,10 @@ handle_connection_error(ldap_instance_t 
 		*result = ISC_R_SUCCESS;
 		ldap_inst->tries = 0;
 		return 0;
-	} else if (err_code == LDAP_SERVER_DOWN) {
+	} else if (err_code == LDAP_SERVER_DOWN || err_code == LDAP_CONNECT_ERROR) {
 		if (ldap_inst->tries == 0)
 			log_error("connection to the LDAP server was lost");
-		*result = ldap_reconnect(ldap_inst);
-		if (*result == ISC_R_SUCCESS)
+		if (ldap_connect(ldap_inst) == ISC_R_SUCCESS)
 			return 1;
 	} else {
 		err_string = ldap_err2string(err_code);


Index: bind-dyndb-ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/bind-dyndb-ldap/F-12/bind-dyndb-ldap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- bind-dyndb-ldap.spec	24 Jul 2009 18:02:47 -0000	1.3
+++ bind-dyndb-ldap.spec	30 Nov 2009 04:11:17 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           bind-dyndb-ldap
 Version:        0.1.0
-Release:        0.3.a1%{?dist}
+Release:        0.4.a1%{?dist}
 Summary:        LDAP back-end plug-in for BIND
 
 Group:          System Environment/Libraries
@@ -13,6 +13,9 @@ BuildRequires:  bind-devel >= 9.6.1-0.3.
 BuildRequires:  openldap-devel
 Requires:       bind >= 9.6.1-0.3.b1
 
+Patch0:         bind-dyndb-ldap-bool_case.patch
+Patch1:         bind-dyndb-ldap-reconnection.patch
+
 %description
 This package provides an LDAP back-end plug-in for BIND. It features
 support for dynamic updates and internal caching, to lift the load
@@ -22,6 +25,9 @@ off of your LDAP server.
 %prep
 %setup -q -n %{name}-%{version}a1
 
+%patch0 -p1 -b .bool_case
+%patch1 -p1 -b .reconnection
+
 
 %build
 %configure
@@ -48,6 +54,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Nov 30 2009 Martin Nagy <mnagy at redhat.com> - 0.1.0-0.4.a1
+- add patches from F-11
+- rebuild for new bind
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.0-0.3.a1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild