extend LDAP search

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 28f7edb84ccafc9e2293517234c2763109507014..64fc5e723e285fed20b438c4b7a983a8ebf5374f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-07-08 [match]     0.9.0claws88
+
+       * src/ldapctrl.c
+               extend LDAP search for first/last name by parsing search term.
+

 2003-07-08 [alfons]    0.9.0claws87
 
        * src/send_message.c
 2003-07-08 [alfons]    0.9.0claws87
 
        * src/send_message.c

diff --git a/configure.ac b/configure.ac
index 42c861294cf3f11b4c8218ec458bad67d97c803d..5af5287fe27f4be5f2280edf56ac62da3de2647f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws87
+EXTRA_VERSION=claws88

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index a25d0633ddb49f8a5c0a8dcdaef42f6332dd9d14..d11454d90bf10b183c8eb62a594e10e8b57fb2a3 100644 (file)
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -383,6 +383,55 @@ void ldapctl_copy( const LdapControl *ctlFrom, LdapControl *ctlTo ) {
        pthread_mutex_unlock( ctlFrom->mutexCtl );
 }
 
        pthread_mutex_unlock( ctlFrom->mutexCtl );
 }
 

+/**
+ * Create an LDAP search criteria by parsing specified search term. The search
+ * term may contain two names separated by the first embedded space found in
+ * the search term. It is assumed that the two tokens are first name and last
+ * name, or vice versa. An appropriate search criteria will be constructed.
+ *
+ * \param  searchTerm Reference to search term to process.
+ * \return Formatted search criteria, or <code>NULL</code> if there is no
+ *         embedded spaces. The search term should be g_free() when no
+ *         longer required.
+ */
+static gchar *ldapctl_build_ldap_criteria( gchar *searchTerm ) {
+       gchar *p;
+       gchar *t1;
+       gchar *t2 = NULL;
+       gchar *term;
+       gchar *crit = NULL;
+
+       term = g_strdup( searchTerm );
+       g_strstrip( term );
+
+       /* Find first space character */        
+       t1 = p = term;
+       while( *p ) {
+               if( *p == ' ' ) {
+                       *p = '\0';
+                       t2 = g_strdup( 1 + p );
+                       break;
+               }
+               p++;
+       }
+
+       if( t2 ) {
+               /* Format search criteria */
+               gchar *p1, *p2;
+
+               g_strstrip( t2 );
+               p1 = g_strdup_printf( "(&(givenName=%s*)(sn=%s*))", t1, t2 );
+               p2 = g_strdup_printf( "(&(givenName=%s*)(sn=%s*))", t2, t1 );
+               crit = g_strdup_printf( "(&(|%s%s)(mail=*))", p1, p2 );
+
+               g_free( t2 );
+               g_free( p1 );
+               g_free( p2 );
+       }
+       g_free( term );
+       return crit;
+}
+

 /**
  * Build a formatted LDAP search criteria string from criteria list.
  * \param ctl  Control object to process.
 /**
  * Build a formatted LDAP search criteria string from criteria list.
  * \param ctl  Control object to process.


@@ -394,7 +443,13 @@ gchar *ldapctl_format_criteria( LdapControl *ctl, const gchar *searchVal ) {
        gchar *p1, *p2, *retVal;
 
        g_return_val_if_fail( ctl != NULL, NULL );
        gchar *p1, *p2, *retVal;
 
        g_return_val_if_fail( ctl != NULL, NULL );

+       g_return_val_if_fail( searchVal != NULL, NULL );
+
+       /* Test whether there are more that one search terms */
+       retVal = ldapctl_build_ldap_criteria( searchVal );
+       if( retVal ) return retVal;

 
 

+       /* No - just a simple search */

        /* p1 contains previous formatted criteria */
        /* p2 contains next formatted criteria */
        retVal = p1 = p2 = NULL;
        /* p1 contains previous formatted criteria */
        /* p2 contains next formatted criteria */
        retVal = p1 = p2 = NULL;