/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2003-2004 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2003-2015 Match Grun and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_LDAP
#include <glib.h>
#include <sys/time.h>
#include <string.h>
-#include <lber.h>
+#include "defs.h"
+#include "ldaputil.h"
#include "ldapquery.h"
#include "ldapctrl.h"
+#include "ldapserver.h"
#include "mgutils.h"
#include "addritem.h"
#include "addrcache.h"
-
-#include "ldapquery.h"
+#include "common/utils.h"
/*
* Key for thread specific data.
static pthread_key_t _queryThreadKey_;
static gboolean _queryThreadInit_ = FALSE;
+static gboolean callbackend (gpointer data)
+{
+ LdapQuery *qry = (LdapQuery *)data;
+ qry->callBackEnd( qry, ADDRQUERY_ID(qry), ADDRQUERY_RETVAL(qry), qry->data );
+ return FALSE;
+}
+
+
/**
* Create new LDAP query object.
* \return Initialized query object.
* \param ctl Control object.
*/
void ldapqry_set_control( LdapQuery *qry, LdapControl *ctl ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
qry->control = ctl;
}
* \param value Name.
*/
void ldapqry_set_name( LdapQuery* qry, const gchar *value ) {
+ cm_return_if_fail( 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));
}
/**
* \param value
*/
void ldapqry_set_search_value( LdapQuery *qry, const gchar *value ) {
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_SEARCHVALUE(qry) = mgu_replace_string( ADDRQUERY_SEARCHVALUE(qry), value );
+ if (ADDRQUERY_SEARCHVALUE(qry) == NULL)
+ return;
g_strstrip( ADDRQUERY_SEARCHVALUE(qry) );
-}
-
-/**
- * Specify error/status.
- * \param qry Query object.
- * \param value Status.
- */
-void ldapqry_set_error_status( LdapQuery* qry, const gint value ) {
- ADDRQUERY_RETVAL(qry) = value;
+ debug_print("search value: %s\n", ADDRQUERY_SEARCHVALUE(qry));
}
/**
* \param value Type.
*/
void ldapqry_set_search_type( LdapQuery *qry, const AddrSearchType value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_SEARCHTYPE(qry) = value;
}
* \param value ID for the query.
*/
void ldapqry_set_query_id( LdapQuery* qry, const gint value ) {
+ cm_return_if_fail( qry != NULL );
ADDRQUERY_ID(qry) = value;
}
-/**
- * Specify maximum number of LDAP entries to retrieve.
- * \param qry Query object.
- * \param value Entries to read.
- */
-void ldapqry_set_entries_read( LdapQuery* qry, const gint value ) {
- if( value > 0 ) {
- qry->entriesRead = value;
- }
- else {
- qry->entriesRead = 0;
- }
-}
-
/**
* Register a callback function that will be executed when each entry
* has been read and processed. When called, the function will be passed
* \param value Value of stop flag.
*/
void ldapqry_set_stop_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
pthread_mutex_lock( qry->mutexStop );
qry->stopFlag = value;
* \param qry Query object.
* \return Value of stop flag.
*/
-gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
+static gboolean ldapqry_get_stop_flag( LdapQuery *qry ) {
gboolean value;
- g_return_if_fail( qry != NULL );
+ cm_return_val_if_fail( qry != NULL, TRUE );
pthread_mutex_lock( qry->mutexStop );
value = qry->stopFlag;
* \param qry Query object.
* \param value Value of busy flag.
*/
-void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+static void ldapqry_set_busy_flag( LdapQuery *qry, const gboolean value ) {
+ cm_return_if_fail( qry != NULL );
+ if (qry->mutexBusy == NULL)
+ return; /* exiting, mutex already freed */
pthread_mutex_lock( qry->mutexBusy );
qry->busyFlag = value;
* \param qry Query object.
* \return Value of busy flag.
*/
-gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
+static gboolean ldapqry_get_busy_flag( LdapQuery *qry ) {
gboolean value;
- g_return_if_fail( qry != NULL );
+ cm_return_val_if_fail( qry != NULL, FALSE );
pthread_mutex_lock( qry->mutexBusy );
value = qry->busyFlag;
* \param qry Query object.
* \param value Value of aged flag.
*/
-void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
- g_return_if_fail( qry != NULL );
+static void ldapqry_set_aged_flag( LdapQuery *qry, const gboolean value ) {
+ cm_return_if_fail( qry != NULL );
qry->agedFlag = value;
}
-/**
- * Test value of aged flag.
- * \param qry Query object.
- * \return <i>TRUE</i> if query has been marked as aged (and can be retired).
- */
-gboolean ldapqry_get_aged_flag( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
- return qry->agedFlag;
-}
-
-/**
- * Specify user data for query.
- * \param qry Query object.
- * \param value Data to set.
- */
-void ldapqry_set_data( LdapQuery *qry, const gpointer value ) {
- g_return_if_fail( qry != NULL );
- qry->data = value;
-}
-
-/**
- * Retrieve user data associated with query.
- * \param qry Query object.
- * \return Data.
- */
-gpointer ldapqry_get_data( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
- return qry->data;
-}
-
-/**
- * Release the LDAP control data associated with the query.
- * \param qry Query object to process.
- */
-void ldapqry_release_control( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
- if( qry->control != NULL ) {
- ldapctl_free( qry->control );
- }
- qry->control = NULL;
-}
-
/**
* Clear LDAP query member variables.
* \param qry Query object.
*/
-void ldapqry_clear( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+static void ldapqry_clear( LdapQuery *qry ) {
+ cm_return_if_fail( qry != NULL );
/* Free internal stuff */
g_free( ADDRQUERY_NAME(qry) );
* \param qry Query object to process.
*/
void ldapqry_free( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
/* Clear out internal members */
ADDRQUERY_TYPE(qry) = ADDRQUERY_NONE;
g_free( qry );
}
-/**
- * Display object to specified stream.
- * \param qry Query object to process.
- * \param stream Output stream.
- */
-void ldapqry_print( const LdapQuery *qry, FILE *stream ) {
- g_return_if_fail( qry != NULL );
-
- fprintf( stream, "LdapQuery:\n" );
- fprintf( stream, " control?: %s\n", qry->control ? "yes" : "no" );
- fprintf( stream, "err/status: %d\n", ADDRQUERY_RETVAL(qry) );
- fprintf( stream, "query type: %d\n", ADDRQUERY_TYPE(qry) );
- fprintf( stream, "searchType: %d\n", ADDRQUERY_SEARCHTYPE(qry) );
- fprintf( stream, "query name: '%s'\n", ADDRQUERY_NAME(qry) );
- fprintf( stream, "search val: '%s'\n", ADDRQUERY_SEARCHVALUE(qry) );
- fprintf( stream, " queryID: %d\n", ADDRQUERY_ID(qry) );
- fprintf( stream, " entries: %d\n", qry->entriesRead );
- fprintf( stream, " elapsed: %d\n", qry->elapsedTime );
- fprintf( stream, " stop flag: %s\n", qry->stopFlag ? "yes" : "no" );
- fprintf( stream, " busy flag: %s\n", qry->busyFlag ? "yes" : "no" );
- fprintf( stream, " aged flag: %s\n", qry->agedFlag ? "yes" : "no" );
- fprintf( stream, " completed: %s\n", qry->completed ? "yes" : "no" );
-}
-
/**
* Free linked lists of character strings.
* \param listName List of common names.
*/
static void ldapqry_free_lists(
GSList *listName, GSList *listAddr, GSList *listFirst,
- GSList *listLast )
+ GSList *listLast, GSList *listDisplay, GSList *other_attrs )
{
+ GSList *cur = other_attrs;
mgu_free_list( listName );
mgu_free_list( listAddr );
mgu_free_list( listFirst );
mgu_free_list( listLast );
+ mgu_free_list( listDisplay );
+ for(;cur; cur = cur->next)
+ addritem_free_attribute((UserAttribute *)cur->data);
+ g_slist_free(other_attrs);
}
/**
{
GSList *list = NULL;
gint i;
- gchar **vals;
+ struct berval **vals;
- if( ( vals = ldap_get_values( ld, entry, attr ) ) != NULL ) {
+ if( ( vals = ldap_get_values_len( ld, entry, attr ) ) != NULL ) {
for( i = 0; vals[i] != NULL; i++ ) {
- /* printf( "lv\t%s: %s\n", attr, vals[i] ); */
- list = g_slist_append( list, g_strdup( vals[i] ) );
+ /*debug_print("lv\t%s: %s\n", attr?attr:"null",
+ vals[i]->bv_val?vals[i]->bv_val:"null");*/
+ list = g_slist_append( list, g_strndup( vals[i]->bv_val, vals[i]->bv_len) );
}
}
- ldap_value_free( vals );
+ ldap_value_free_len( vals );
return list;
}
*/
static GSList *ldapqry_add_single_value( LDAP *ld, LDAPMessage *entry, char *attr ) {
GSList *list = NULL;
- gchar **vals;
+ struct berval **vals;
- if( ( vals = ldap_get_values( ld, entry, attr ) ) != NULL ) {
+ if( ( vals = ldap_get_values_len( ld, entry, attr ) ) != NULL ) {
if( vals[0] != NULL ) {
- /* printf( "sv\t%s: %s\n", attr, vals[0] ); */
- list = g_slist_append( list, g_strdup( vals[0] ) );
+ if (strcmp(attr, "jpegPhoto")) {
+ debug_print("sv\t%s: %s\n", attr?attr:"null",
+ vals[0]->bv_val?vals[0]->bv_val:"null");
+ list = g_slist_append( list, g_strndup( vals[0]->bv_val, vals[0]->bv_len ));
+ } else {
+ char *file = get_tmp_file();
+ FILE *fp = g_fopen(file, "wb");
+ if (fp) {
+ fwrite(vals[0]->bv_val, 1, vals[0]->bv_len, fp);
+ fclose(fp);
+ }
+ list = g_slist_append( list, file);
+ }
}
}
- ldap_value_free( vals );
+ ldap_value_free_len( vals );
return list;
}
static GList *ldapqry_build_items_fl(
AddressCache *cache, LdapQuery *qry, gchar *dn,
GSList *listName, GSList *listAddr, GSList *listFirst,
- GSList *listLast )
+ GSList *listLast, GSList *listDisplay, GSList *attributes )
{
- GSList *nodeAddress;
+ GSList *nodeAddress, *cur;
gchar *firstName = NULL, *lastName = NULL, *fullName = NULL;
- gboolean allocated;
+ gboolean allocated = FALSE;
ItemPerson *person;
ItemEMail *email;
ItemFolder *folder;
+ gchar *picfile = NULL;
GList *listReturn = NULL;
folder = ADDRQUERY_FOLDER(qry);
if( folder == NULL ) return listReturn;
if( listAddr == NULL ) return listReturn;
+ if ( listDisplay ) {
+ allocated = FALSE;
+ fullName = listDisplay->data;
+ }
+
/* Find longest first name in list */
firstName = mgu_slist_longest_entry( listFirst );
lastName = listLast->data;
}
- /* Find longest common name */
- allocated = FALSE;
- fullName = mgu_slist_longest_entry( listName );
- if( fullName == NULL ) {
- /* Format a full name from first and last names */
- if( firstName ) {
- if( lastName ) {
- fullName = g_strdup_printf( "%s %s", firstName, lastName );
+ if ( fullName == NULL ) {
+ /* Find longest common name */
+ allocated = FALSE;
+ fullName = mgu_slist_longest_entry( listName );
+ if( fullName == NULL ) {
+ /* Format a full name from first and last names */
+ if( firstName ) {
+ if( lastName ) {
+ fullName = g_strdup_printf( "%s %s", firstName, lastName );
+ }
+ else {
+ fullName = g_strdup_printf( "%s", firstName );
+ }
}
else {
- fullName = g_strdup_printf( "%s", firstName );
+ if( lastName ) {
+ fullName = g_strdup_printf( "%s", lastName );
+ }
}
- }
- else {
- if( lastName ) {
- fullName = g_strdup_printf( "%s", lastName );
+ if( fullName ) {
+ g_strstrip( fullName );
+ allocated = TRUE;
}
}
- if( fullName ) {
- g_strchug( fullName ); g_strchomp( fullName );
- allocated = TRUE;
- }
}
/* Add person into folder */
addritem_person_set_common_name( person, fullName );
addritem_person_set_first_name( person, firstName );
addritem_person_set_last_name( person, lastName );
+ addritem_person_set_nick_name( person, fullName );
addrcache_id_person( cache, person );
addritem_person_set_external_id( person, dn );
+
+ for (cur = attributes; cur; cur = cur->next) {
+ UserAttribute *attrib = addritem_copy_attribute((UserAttribute *)cur->data);
+ if (attrib->name && strcmp(attrib->name, "jpegPhoto")) {
+ addritem_person_add_attribute( person, attrib );
+ } else {
+ if (qry->server && qry->server->control) {
+ gchar *dir = g_strconcat( get_rc_dir(), G_DIR_SEPARATOR_S,
+ ADDRBOOK_DIR, G_DIR_SEPARATOR_S, NULL );
+ gchar *filename = g_strdup_printf("%s-%s-%s",
+ qry->server->control->hostName?qry->server->control->hostName:"nohost",
+ qry->server->control->baseDN?qry->server->control->baseDN:"nobase",
+ dn);
+ picfile = g_strdup_printf("%s%s.png", dir, filename);
+ addritem_person_set_picture( person, filename );
+ rename_force(attrib->value, picfile);
+ g_free(filename);
+ g_free(picfile);
+ g_free(dir);
+ }
+ }
+ }
+
addrcache_folder_add_person( cache, ADDRQUERY_FOLDER(qry), person );
qry->entriesRead++;
addrcache_id_email( cache, email );
addrcache_person_add_email( cache, person, email );
addritem_person_add_email( person, email );
+ /*if (debug_get_mode()) {
+ addritem_print_item_email(email, stdout);
+ }*/
listReturn = g_list_append( listReturn, email );
nodeAddress = g_slist_next( nodeAddress );
}
BerElement *ber;
GSList *listName = NULL, *listAddress = NULL;
GSList *listFirst = NULL, *listLast = NULL;
+ GSList *listDisplay = NULL;
+ GSList *other_attrs = NULL;
GList *listReturn;
listReturn = NULL;
ctl = qry->control;
dnEntry = ldap_get_dn( ld, e );
- /* printf( "DN: %s\n", dnEntry ); */
+ debug_print( "DN: %s\n", dnEntry?dnEntry:"null" );
/* Process all attributes */
for( attribute = ldap_first_attribute( ld, e, &ber ); attribute != NULL;
attribute = ldap_next_attribute( ld, e, ber ) ) {
-
if( strcasecmp( attribute, ctl->attribEMail ) == 0 ) {
listAddress = ldapqry_add_list_values( ld, e, attribute );
}
}
else if( strcasecmp( attribute, ctl->attribLName ) == 0 ) {
listLast = ldapqry_add_single_value( ld, e, attribute );
+ } else if( strcasecmp( attribute, ctl->attribDName ) == 0 ) {
+ listDisplay = ldapqry_add_single_value( ld, e, attribute );
+ } else {
+ GSList *attlist = ldapqry_add_single_value( ld, e, attribute );
+ UserAttribute *attrib = addritem_create_attribute();
+ const gchar *attvalue = attlist?((gchar *)attlist->data):NULL;
+ if (attvalue) {
+ addritem_attrib_set_name( attrib, attribute );
+ addritem_attrib_set_value( attrib, attvalue );
+ other_attrs = g_slist_prepend(other_attrs, attrib);
+ }
+ mgu_free_list(attlist);
}
-
/* Free memory used to store attribute */
ldap_memfree( attribute );
}
/* Format and add items to cache */
listReturn = ldapqry_build_items_fl(
- cache, qry, dnEntry, listName, listAddress, listFirst, listLast );
+ cache, qry, dnEntry, listName, listAddress, listFirst, listLast, listDisplay, other_attrs );
/* Free up */
- ldapqry_free_lists( listName, listAddress, listFirst, listLast );
- listName = listAddress = listFirst = listLast = NULL;
+ ldapqry_free_lists( listName, listAddress, listFirst, listLast, listDisplay, other_attrs );
+ listName = listAddress = listFirst = listLast = listDisplay = other_attrs = NULL;
if( ber != NULL ) {
ber_free( ber, 0 );
}
- g_free( dnEntry );
+ ldap_memfree( dnEntry );
return listReturn;
}
*/
static gint ldapqry_connect( LdapQuery *qry ) {
LdapControl *ctl;
- LDAP *ld;
- gint rc;
- gint version;
+ LDAP *ld = NULL;
/* Initialize connection */
- /* printf( "===ldapqry_connect===\n" ); */
- /* ldapqry_print( qry, stdout ); */
+ if (debug_get_mode()) {
+ debug_print("===ldapqry_connect===\n");
+ /*ldapqry_print(qry, stdout);*/
+ }
ctl = qry->control;
- /* ldapctl_print( ctl, stdout ); */
- /* printf( "======\n" ); */
+ /*if (debug_get_mode()) {
+ ldapctl_print(ctl, stdout);
+ debug_print("======\n");
+ }*/
ldapqry_touch( qry );
qry->startTime = qry->touchTime;
qry->elapsedTime = -1;
ADDRQUERY_RETVAL(qry) = LDAPRC_INIT;
- if( ( ld = ldap_init( ctl->hostName, ctl->port ) ) == NULL ) {
+
+ ld = ldapsvr_connect(ctl);
+
+ if (ld == NULL)
return ADDRQUERY_RETVAL(qry);
- }
+
qry->ldap = ld;
ADDRQUERY_RETVAL(qry) = LDAPRC_STOP_FLAG;
if( ldapqry_get_stop_flag( qry ) ) {
}
ldapqry_touch( qry );
- /*
- printf( "connected to LDAP host %s on port %d\n", ctl->hostName, ctl->port );
- */
-
-#ifdef USE_LDAP_TLS
- /* Handle TLS */
- version = LDAP_VERSION3;
- rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
- if( rc == LDAP_OPT_SUCCESS ) {
- ctl->version = LDAP_VERSION3;
- }
+ debug_print("connected to LDAP host %s on port %d\n",
+ ctl->hostName?ctl->hostName:"null", ctl->port);
- if( ctl->version == LDAP_VERSION3 ) {
- if( ctl->enableTLS ) {
- ADDRQUERY_RETVAL(qry) = LDAPRC_TLS;
- rc = ldap_start_tls_s( ld, NULL, NULL );
- /*
- printf( "rc=%d\n", rc );
- printf( "LDAP Status: set_option: %s\n", ldap_err2string( rc ) );
- */
- if( rc != LDAP_SUCCESS ) {
- return ADDRQUERY_RETVAL(qry);
- }
- }
- }
-#endif
-
- /* Bind to the server, if required */
- ADDRQUERY_RETVAL(qry) = LDAPRC_BIND;
- if( ctl->bindDN ) {
- if( * ctl->bindDN != '\0' ) {
- /* printf( "binding...\n" ); */
- rc = ldap_simple_bind_s( ld, ctl->bindDN, ctl->bindPass );
- /* printf( "rc=%d\n", rc ); */
- if( rc != LDAP_SUCCESS ) {
- /*
- printf( "LDAP Error: ldap_simple_bind_s: %s\n",
- ldap_err2string( rc ) );
- */
- return ADDRQUERY_RETVAL(qry);
- }
- }
- }
ADDRQUERY_RETVAL(qry) = LDAPRC_STOP_FLAG;
if( ldapqry_get_stop_flag( qry ) ) {
return ADDRQUERY_RETVAL(qry);
*/
static gint ldapqry_disconnect( LdapQuery *qry ) {
/* Disconnect */
- if( qry->ldap ) ldap_unbind( qry->ldap );
+ if( qry->ldap ) ldap_unbind_ext( qry->ldap, NULL, NULL );
qry->ldap = NULL;
ldapqry_touch( qry );
static gint ldapqry_search_retrieve( LdapQuery *qry ) {
LdapControl *ctl;
LDAP *ld;
- LDAPMessage *result, *e;
+ LDAPMessage *result = NULL, *e = NULL;
char **attribs;
gchar *criteria;
gboolean searchFlag;
ADDRQUERY_RETVAL(qry) = LDAPRC_SUCCESS;
/* Define all attributes we are interested in. */
- attribs = ldapctl_attribute_array( ctl );
+ attribs = ldapctl_full_attribute_array( ctl );
/* Create LDAP search string */
criteria = ldapctl_format_criteria( ctl, ADDRQUERY_SEARCHVALUE(qry) );
- /* printf( "Search criteria ::%s::\n", criteria ); */
+ debug_print("Search criteria ::%s::\n", criteria?criteria:"null");
/*
* Execute the search - this step may take some time to complete
ADDRQUERY_RETVAL(qry) = LDAPRC_TIMEOUT;
rc = ldap_search_ext_s( ld, ctl->baseDN, LDAP_SCOPE_SUBTREE, criteria,
attribs, 0, NULL, NULL, &timeout, 0, &result );
+ debug_print("LDAP Error: ldap_search_st: %d\n", rc);
+ debug_print("LDAP Error: ldap_search_st: %s\n", ldaputil_get_error(ld));
ldapctl_free_attribute_array( attribs );
g_free( criteria );
criteria = NULL;
else if( rc == LDAP_SUCCESS ) {
searchFlag = TRUE;
}
- else if( rc == LDAP_PARTIAL_RESULTS ) {
+ else if( rc == LDAP_PARTIAL_RESULTS || (result && ldap_count_entries(ld, result) > 0) ) {
searchFlag = TRUE;
}
else {
- /*
- printf( "LDAP Error: ldap_search_st: %d\n", rc );
- printf( "LDAP Error: ldap_search_st: %s\n", ldap_err2string( rc ) );
- */
+ debug_print("LDAP Error: ldap_search_st: %d\n", rc);
+ debug_print("LDAP Error: ldap_search_st: %s\n", ldaputil_get_error(ld));
return ADDRQUERY_RETVAL(qry);
}
ADDRQUERY_RETVAL(qry) = LDAPRC_STOP_FLAG;
- /*
- printf( "Total results are: %d\n", ldap_count_entries( ld, result ) );
- */
+#ifdef G_OS_WIN32
+ debug_print("Total results are: %lu\n", ldap_count_entries(ld, result));
+#else
+ debug_print("Total results are: %d\n", ldap_count_entries(ld, result));
+#endif
/* Process results */
first = TRUE;
listEMail = ldapqry_process_single_entry( cache, qry, ld, e );
/* Process callback */
- if( qry->callBackEntry ) {
+ if( qry->callBackEntry )
qry->callBackEntry( qry, ADDRQUERY_ID(qry), listEMail, qry->data );
- }
- else {
+ else
g_list_free( listEMail );
- }
pthread_mutex_unlock( qry->mutexEntry );
}
return ADDRQUERY_RETVAL(qry);
}
+static gint ldapqry_perform_locate( LdapQuery *qry );
+
/**
* Wrapper around search.
* \param qry Query object to process.
* \return Error/status code.
*/
-gint ldapqry_search( LdapQuery *qry ) {
+static gint ldapqry_search( LdapQuery *qry ) {
gint retVal;
- g_return_val_if_fail( qry != NULL, -1 );
- g_return_val_if_fail( qry->control != NULL, -1 );
+ cm_return_val_if_fail( qry != NULL, -1 );
+ cm_return_val_if_fail( qry->control != NULL, -1 );
ldapqry_touch( qry );
qry->completed = FALSE;
qry->server->addressCache->dataRead = TRUE;
qry->server->addressCache->accessFlag = FALSE;
if( ldapqry_get_stop_flag( qry ) ) {
- /*
- printf( "Search was terminated prematurely\n" );
- */
+ debug_print("Search was terminated prematurely\n");
}
else {
ldapqry_touch( qry );
qry->completed = TRUE;
- /*
- printf( "Search ran to completion\n" );
- */
+ debug_print("Search ran to completion\n");
}
}
ldapqry_set_stop_flag( qry, TRUE );
/* Process callback */
if( qry->callBackEnd ) {
- qry->callBackEnd( qry, ADDRQUERY_ID(qry), ADDRQUERY_RETVAL(qry), qry->data );
+ g_timeout_add(0, callbackend, qry);
}
return ADDRQUERY_RETVAL(qry);
* \return Error/status code.
*/
gint ldapqry_read_data_th( LdapQuery *qry ) {
- g_return_val_if_fail( qry != NULL, -1 );
- g_return_val_if_fail( qry->control != NULL, -1 );
+ cm_return_val_if_fail( qry != NULL, -1 );
+ cm_return_val_if_fail( qry->control != NULL, -1 );
ldapqry_set_stop_flag( qry, FALSE );
ldapqry_touch( qry );
if( ldapqry_check_search( qry ) ) {
if( ADDRQUERY_RETVAL(qry) == LDAPRC_SUCCESS ) {
- /*
- printf( "Starting LDAP search thread\n");
- */
+ debug_print("Starting LDAP search thread\n");
ldapqry_set_busy_flag( qry, TRUE );
qry->thread = g_malloc0( sizeof( pthread_t ) );
/* Setup thread */
- pthread_create( qry->thread, NULL,
- (void *) ldapqry_search, (void *) qry );
+ if (pthread_create( qry->thread, NULL,
+ (void *) ldapqry_search, (void *) qry ) != 0) {
+ g_free(qry->thread);
+ qry->thread = NULL;
+ ADDRQUERY_RETVAL(qry) = LDAPRC_SEARCH;
+ }
}
}
return ADDRQUERY_RETVAL(qry);
LdapQuery *qry;
qry = ( LdapQuery * ) ptr;
- /*
- printf( "ldapqry_destroyer::%d::%s\n", (int) pthread_self(), ADDRQUERY_NAME(qry) );
- */
+ cm_return_if_fail( qry != NULL );
/* Perform any destruction here */
if( qry->control != NULL ) {
* \param qry Query object to process.
*/
void ldapqry_cancel( LdapQuery *qry ) {
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
- /*
- printf( "cancelling::%d::%s\n", (int) pthread_self(), ADDRQUERY_NAME(qry) );
- */
if( ldapqry_get_busy_flag( qry ) ) {
if( qry->thread ) {
- /* printf( "calling pthread_cancel\n" ); */
+ debug_print("calling pthread_cancel\n");
pthread_cancel( * qry->thread );
}
}
* any LDAP queries to initialize thread specific data.
*/
void ldapqry_initialize( void ) {
- /* printf( "ldapqry_initialize...\n" ); */
+ debug_print("ldapqry_initialize...\n");
if( ! _queryThreadInit_ ) {
- /*
- printf( "ldapqry_initialize::creating thread specific area\n" );
- */
+ debug_print("ldapqry_initialize::creating thread specific area\n");
pthread_key_create( &_queryThreadKey_, ldapqry_destroyer );
_queryThreadInit_ = TRUE;
}
- /* printf( "ldapqry_initialize... done!\n" ); */
+ debug_print("ldapqry_initialize... done!\n");
}
/**
void ldapqry_age( LdapQuery *qry, gint maxAge ) {
gint age;
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
/* Limit the time that queries can hang around */
if( maxAge < 1 ) maxAge = LDAPCTL_MAX_QUERY_AGE;
AddressCache *cache;
ItemFolder *folder;
- g_return_if_fail( qry != NULL );
+ cm_return_if_fail( qry != NULL );
folder = ADDRQUERY_FOLDER(qry);
if( folder ) {
}
}
-/**
- * Print name/value pair object for debug.
- * \param nvp Name/value object.
- * \param stream Output stream.
- */
-void ldapqry_print_name_value( NameValuePair *nvp, FILE *stream ) {
- if( nvp ) {
- fprintf( stream, "n/v ::%s::%s::\n", nvp->name, nvp->value );
- }
-}
-
/**
* Free up a list name/value pair objects.
* \param list List of name/value objects.
{
GList *list = NULL;
gint i;
- gchar **vals;
+ struct berval **vals;
NameValuePair *nvp;
list = listValues;
- if( ( vals = ldap_get_values( ld, entry, attr ) ) != NULL ) {
+ if( ( vals = ldap_get_values_len( ld, entry, attr ) ) != NULL ) {
for( i = 0; vals[i] != NULL; i++ ) {
- nvp = ldapqry_create_name_value( attr, vals[i] );
+ gchar *tmp = g_strndup( vals[i]->bv_val, vals[i]->bv_len);
+ nvp = ldapqry_create_name_value( attr, tmp );
+ g_free(tmp);
list = g_list_append( list, nvp );
}
}
- ldap_value_free( vals );
+ ldap_value_free_len( vals );
return list;
}
static gint ldapqry_locate_retrieve( LdapQuery *qry ) {
LdapControl *ctl;
LDAP *ld;
- LDAPMessage *result, *e;
+ LDAPMessage *result, *e = NULL;
gboolean entriesFound;
gboolean first;
struct timeval timeout;
}
ADDRQUERY_RETVAL(qry) = LDAPRC_SEARCH;
if( rc != LDAP_SUCCESS ) {
- /*
- printf( "LDAP Error: ldap_search_st: %s\n", ldap_err2string( rc ) );
- */
+ debug_print("LDAP Error: ldap_search_st: %s\n", ldaputil_get_error(ld));
return ADDRQUERY_RETVAL(qry);
}
- /*
- printf( "Total results are: %d\n", ldap_count_entries( ld, result ) );
- */
+#ifdef G_OS_WIN32
+ debug_print("Total results are: %lu\n", ldap_count_entries(ld, result));
+#else
+ debug_print("Total results are: %d\n", ldap_count_entries(ld, result));
+#endif
/* Process results */
ADDRQUERY_RETVAL(qry) = LDAPRC_STOP_FLAG;
* \param qry Query object to process.
* \return Error/status code.
*/
-gint ldapqry_perform_locate( LdapQuery *qry ) {
+static gint ldapqry_perform_locate( LdapQuery *qry ) {
/* Connect */
qry->ldap = NULL;
ldapqry_connect( qry );
/* Process callback */
if( qry->callBackEnd ) {
- qry->callBackEnd( qry, ADDRQUERY_ID(qry), ADDRQUERY_RETVAL(qry), qry->data );
+ g_timeout_add(0, callbackend, qry);
}
return ADDRQUERY_RETVAL(qry);
return retVal;
}
+void ldapqry_print(LdapQuery *qry, FILE *stream) {
+ cm_return_if_fail( qry != NULL );
+
+ ldapsvr_print_data(qry->server, stream);
+ ldapctl_print(qry->control, stream);
+ fprintf(stream, "entriesRead: %d\n", qry->entriesRead);
+ fprintf(stream, "elapsedTime: %d\n", qry->elapsedTime);
+ fprintf(stream, "stopFlag: %d\n", qry->stopFlag);
+ fprintf(stream, "busyFlag: %d\n", qry->busyFlag);
+ fprintf(stream, "agedFlag: %d\n", qry->agedFlag);
+ fprintf(stream, "completed: %d\n", qry->completed);
+ fprintf(stream, "startTime: %d\n", (int) qry->startTime);
+ fprintf(stream, "touchTime: %d\n", (int) qry->touchTime);
+ fprintf(stream, "data: %s\n", qry->data?(gchar *)qry->data:"null");
+}
+
#endif /* USE_LDAP */
/*
projects / claws.git / blobdiff