2007-08-22 [colin] 2.10.0cvs149

	* src/ldapquery.c
		Finish previous fix

diff --git a/ChangeLog b/ChangeLog
index 8759d736ca5df23d38420b7e614458bfc0a3858e..5cabc2fcbb719645dec46b48d52428612e025f6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-22 [colin]     2.10.0cvs149
+
+       * src/ldapquery.c
+               Finish previous fix
+
 2007-08-22 [colin]     2.10.0cvs148
 
        * src/ldapquery.c

diff --git a/PATCHSETS b/PATCHSETS
index 0cf67e101e7c6e00efe7cdb91653afe34a7dc57b..09f57ecbd41d3acc82a17864b4321b3fc4d50067 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2803,3 +2803,4 @@
 ( cvs diff -u -r 1.8.2.27 -r 1.8.2.28 src/editldap.c;  cvs diff -u -r 1.1.4.10 -r 1.1.4.11 src/ldaputil.c;  ) > 2.10.0cvs146.patchset
 ( cvs diff -u -r 1.1.4.11 -r 1.1.4.12 src/ldaputil.c;  ) > 2.10.0cvs147.patchset
 ( cvs diff -u -r 1.3.2.23 -r 1.3.2.24 src/ldapquery.c;  ) > 2.10.0cvs148.patchset
+( cvs diff -u -r 1.3.2.24 -r 1.3.2.25 src/ldapquery.c;  ) > 2.10.0cvs149.patchset

diff --git a/configure.ac b/configure.ac
index a9acaa5424510d7ceee12b57837a861587ded8b1..c52def11aee0920518ba5935c378c1ff60a55e2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=10
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=148
+EXTRA_VERSION=149
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/ldapquery.c b/src/ldapquery.c
index 04275e820accacb216d6a8730e7543f9b8b4d63e..9cd6dc264e1e6b1bd899b03c2c11fbb4d60ab79b 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -1013,10 +1013,9 @@ static void ldapqry_destroyer( void * ptr ) {
 
        qry = ( LdapQuery * ) ptr;
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_NAME(qry) != NULL );
 
        debug_print("ldapqry_destroyer::%d::%s\n", (int) pthread_self(),
-                       ADDRQUERY_NAME(qry));
+                       ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null");
 
        /* Perform any destruction here */
        if( qry->control != NULL ) {