2007-08-20 [colin] 2.10.0cvs137

[claws.git] / src / ldapctrl.c

diff --git a/src/ldapctrl.c b/src/ldapctrl.c
index 11b38b81efd2f34005f2dc9996963d01f1cfdf18..4cfc74c078408bc60e4a0bde4d2af33608d6a664 100644 (file)
--- a/src/ldapctrl.c
+++ b/src/ldapctrl.c
@@ -526,7 +526,6 @@ gchar *ldapctl_format_criteria( LdapControl *ctl, const gchar *searchVal ) {
        node = ctl->listCriteria;
        while( node ) {
                gchar *attr, *tmp;
-
                attr = node->data;
                node = g_list_next( node );
 
@@ -664,11 +663,13 @@ void ldapctl_parse_ldap_search( LdapControl *ctl, gchar *criteria ) {
  * \return Formatted string or <i>""</i>. Should be g_free() when done.
  */
 gchar *ldapctl_get_default_criteria() {
-       gchar *retVal = LDAPCTL_DFL_ATTR_LIST;
+       gchar *retVal = g_strdup(LDAPCTL_DFL_ATTR_LIST);
        const gchar **attrs = ATTRIBUTE; 
 
        while (*attrs) {
-               retVal = g_strdup_printf("%s, %s", retVal, *attrs++);
+               gchar *tmp = g_strdup_printf("%s, %s", retVal, *attrs++);
+               g_free(retVal);
+               retVal = tmp;
        }
        debug_print("default search criteria: %s\n", retVal);
        return retVal;