2007-08-22 [colin] 2.10.0cvs146

[claws.git] / src / editldap.c

diff --git a/src/editldap.c b/src/editldap.c
index 6aa5af20d2576d8885374f6efed2bf152c31f29d..00c10a78d58ac259d36c6aa5a4964b0d62804639 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -97,6 +97,8 @@ static gboolean editldap_validate_criteria( gchar *criteria ) {
        gint i;
        gboolean errorFlag;
 
+       g_return_val_if_fail(criteria != NULL, TRUE);
+
        errorFlag = TRUE;
 
        /* Replace delimiters with spaces */
@@ -258,8 +260,10 @@ static void edit_ldap_server_check( void ) {
                                }
                                mgu_free_dlist( baseDN );
                                baseDN = node = NULL;
+                               flg = TRUE;
+                       } else {
+                               flg = FALSE;
                        }
-                       flg = TRUE;
                }
        }
        g_free( sHost );
@@ -1044,7 +1048,8 @@ AdapterDSource *addressbook_edit_ldap(
        tls = gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON( ldapedit.enable_tls ) );
 #endif
-       debug_print("saving server config:\nname: %s\nhost: %s\nbase: %s\ncriteria: %s\nbind: %s\nport: %d\ntime: %d\nmax_entries: %d\ntimeout: %d\ndynamic: %d\ncheck_match: %d\n",sName, sHost, sBase, sCrit, sBind, iPort, iTime, iMaxE, iAge, bSrch, bMatch);
+       debug_print("saving server config:\nname: %s\nhost: %s\nbase: %s\ncriteria: %s\nbind: %s\nport: %d\ntime: %d\nmax_entries: %d\ntimeout: %d\ndynamic: %d\ncheck_match: %d\n",
+                       sName, sHost, sBase, sCrit, sBind, iPort, iTime, iMaxE, iAge, bSrch, bMatch);
        fin = FALSE;
        if( *sName == '\0' ) fin = TRUE;
        if( *sHost == '\0' ) fin = TRUE;