2007-08-22 [wwp] 2.10.0cvs151

[claws.git] / src / ldapquery.c

diff --git a/src/ldapquery.c b/src/ldapquery.c
index 9cd6dc264e1e6b1bd899b03c2c11fbb4d60ab79b..1da82a4cb2f63c7860848891a9a444cce61d0638 100644 (file)
--- a/src/ldapquery.c
+++ b/src/ldapquery.c
@@ -115,8 +115,9 @@ void ldapqry_set_control( LdapQuery *qry, LdapControl *ctl ) {
  */
 void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_NAME(qry) = mgu_replace_string( ADDRQUERY_NAME(qry), value );
+       if (ADDRQUERY_NAME(qry) == NULL)
+               return;
        g_strstrip( ADDRQUERY_NAME(qry) );
        debug_print("set name: %s\n", ADDRQUERY_NAME(qry));
 }
@@ -128,8 +129,9 @@ void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
  */
 void ldapqry_set_search_value( LdapQuery *qry, const gchar *value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_SEARCHVALUE(qry) = mgu_replace_string( ADDRQUERY_SEARCHVALUE(qry), value );
+       if (ADDRQUERY_SEARCHVALUE(qry) == NULL)
+               return;
        g_strstrip( ADDRQUERY_SEARCHVALUE(qry) );
        debug_print("search value: %s\n", ADDRQUERY_SEARCHVALUE(qry));
 }
@@ -157,7 +159,6 @@ void ldapqry_set_query_type( LdapQuery* qry, const gint value ) {
  */
 void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_SEARCHTYPE(qry) = value;
 }
 
@@ -168,7 +169,6 @@ void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
  */
 void ldapqry_set_query_id( LdapQuery* qry, const gint value ) {
        g_return_if_fail( qry != NULL );
-       g_return_if_fail( ADDRQUERY_OBJECT(qry) != NULL );
        ADDRQUERY_ID(qry) = value;
 }
 
@@ -678,6 +678,8 @@ static gint ldapqry_connect( LdapQuery *qry ) {
        qry->elapsedTime = -1;
        ADDRQUERY_RETVAL(qry) = LDAPRC_INIT;
 
+       ldapsrv_set_options (ctl->timeOut, NULL);
+
        uri = g_strdup_printf("ldap%s://%s:%d",
                                ctl->enableSSL?"s":"",
                                ctl->hostName, ctl->port);
@@ -1033,7 +1035,8 @@ static void ldapqry_destroyer( void * ptr ) {
 void ldapqry_cancel( LdapQuery *qry ) {
        g_return_if_fail( qry != NULL );
 
-       debug_print("cancelling::%d::%s\n", (int) pthread_self(), ADDRQUERY_NAME(qry));
+       debug_print("cancelling::%d::%s\n", (int) pthread_self(),
+                       ADDRQUERY_NAME(qry)?ADDRQUERY_NAME(qry):"null");
        if( ldapqry_get_busy_flag( qry ) ) {
                if( qry->thread ) {
                        debug_print("calling pthread_cancel\n");