Patch: LDAP address book updates

[Toralf Lund <toralf kscanners com>]

A patch for LDAP address book, this time, it will:

1. Introduce the necessary UTF-8 encoding and decoding for LDAP string 
values.
2. Modify the search string for address completion so that "name" part of 
e-mail address is also considered.

Some of this has been submitted earlier, some is new.

-- 
Toralf Lund <toralf@kscanners.com>  +47 66 85 51 22
Kongsberg Scanners AS               +47 66 85 51 00 (switchboard)
http://www.kscanners.no/~toralf     +47 66 85 51 01 (fax)
Index: libbalsa/address-book-ldap.c
===================================================================
RCS file: /cvs/gnome/balsa/libbalsa/address-book-ldap.c,v
retrieving revision 1.12
diff -u -b -r1.12 address-book-ldap.c
--- libbalsa/address-book-ldap.c	2001/08/28 09:24:30	1.12
+++ libbalsa/address-book-ldap.c	2001/11/13 09:29:41
@@ -31,6 +31,7 @@
 #include <sys/time.h>
 #include <lber.h>
 #include <ldap.h>
+#include <iconv.h>
 
 #include "address-book.h"
 #include "address-book-ldap.h"
@@ -49,7 +50,10 @@
     NULL
 };
 /* End of FIXME */
+#define LDAP_CODESET "UTF-8"
+#define BALSA_CODESET "ISO-8859-1"
 
+
 static GtkObjectClass *parent_class = NULL;
 
 static void
@@ -282,6 +286,52 @@
     ldap_msgfree(result);
 }
 
+/* ldap_get_string:
+   Return native version of an LDAP encoded string.
+ 
+ */
+
+static gchar *ldap_get_string(const gchar *ldap_string)
+{
+    char *in=(char *)ldap_string;
+    size_t len=strlen(in), outlen=len;
+    char *native_string=calloc(outlen+1, sizeof(char)), *out=native_string;
+    iconv_t conv=iconv_open(BALSA_CODESET, LDAP_CODESET);
+
+    while(len>0 && outlen>0) {
+	if(iconv(conv, &in, &len, &out, &outlen)!=0) {
+	    in++;		/* *** */
+	    len--;
+	}
+    }
+    iconv_close(conv);
+    
+    return (gchar *)native_string;
+}
+
+/* ldap_set_string:
+   Return native LDAP encoded version of string.
+ */
+
+static gchar *ldap_set_string(const gchar *native_string)
+{
+    char *in=(char *)native_string;
+    size_t len=strlen(in), outlen=2*len; /* Worst case */
+    char *ldap_string=calloc(outlen+1, sizeof(char)), *out=ldap_string;
+    iconv_t conv=iconv_open(LDAP_CODESET, BALSA_CODESET);
+
+    while(len>0 && outlen>0) {
+	if(iconv(conv, &in, &len, &out, &outlen)!=0) {
+	    in++;		/* *** */
+	    len--;
+	}
+    }
+    iconv_close(conv);
+    
+    return (gchar *)ldap_string;
+}
+
+
 /* libbalsa_address_book_ldap_get_address:
  * loads a single address from connection specified by LDAPMessage.
  */
@@ -308,13 +358,13 @@
 	if ((vals = ldap_get_values(ldap_ab->directory, e, attr)) != NULL) {
 	    for (i = 0; vals[i] != NULL; i++) {
 		if ((g_strcasecmp(attr, "sn") == 0) && (!last))
-		    last = g_strdup(vals[i]);
+		    last = ldap_get_string(vals[i]);
 		if ((g_strcasecmp(attr, "cn") == 0) && (!id))
-		    id = g_strdup(vals[i]);
+		    id = ldap_get_string(vals[i]);
 		if ((g_strcasecmp(attr, "givenname") == 0) && (!first))
-		    first = g_strdup(vals[i]);
+		    first = ldap_get_string(vals[i]);
 		if ((g_strcasecmp(attr, "mail") == 0) && (!email))
-		    email = g_strdup(vals[i]);
+		    email = ldap_get_string(vals[i]);
 	    }
 	    ldap_value_free(vals);
 	}
@@ -481,6 +531,7 @@
     GList *res = NULL;
     gchar* filter;
     gchar* escaped;
+    gchar* ldap;
     int rc;
     LDAPMessage * e, *result;
 
@@ -498,8 +549,12 @@
      */
     *new_prefix = NULL;
     escaped = rfc_2254_escape(prefix);
-    filter = g_strdup_printf("(&(mail=*)(cn=%s*))", escaped);
+    ldap=ldap_set_string(escaped);
     g_free(escaped);
+
+    filter = g_strdup_printf("(&(mail=*)(|(cn=%s*)(sn=%s*)(mail=%s@*)))", 
+			     ldap, ldap, ldap);
+    g_free(ldap);
     rc = ldap_search_st(ldap_ab->directory, ldap_ab->base_dn,
 	   LDAP_SCOPE_SUBTREE, filter, attrs, 0, &timeout, &result);
     g_print("Sent LDAP request: %s (basedn=%s)\n", filter, ldap_ab->base_dn);