Allow TLS connections to LDAP on Windows.

[claws.git] / src / editldap.c

diff --git a/src/editldap.c b/src/editldap.c
index 5c562bdac03f4401078b08e6428c725c2ce82125..47d702ea81762e2719dc6a5664d6dc8d65cc1c88 100644 (file)
--- a/src/editldap.c
+++ b/src/editldap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2007 Match Grun and the Claws Mail team
+ * Copyright (C) 2001-2013 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
@@ -23,6 +23,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #ifdef USE_LDAP
@@ -75,7 +76,7 @@ static struct _LDAPEdit {
        GtkWidget *spinbtn_queryage;
        GtkWidget *check_dynsearch;
        GtkWidget *check_matchoption;
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        GtkWidget *enable_ssl;
        GtkWidget *enable_tls;
 #endif
@@ -92,7 +93,7 @@ static gboolean editldap_validate_criteria( gchar *criteria ) {
        gint i;
        gboolean errorFlag;
 
-       g_return_val_if_fail(criteria != NULL, TRUE);
+       cm_return_val_if_fail(criteria != NULL, TRUE);
 
        errorFlag = TRUE;
 
@@ -206,7 +207,7 @@ static gint edit_ldap_delete_event( GtkWidget *widget, GdkEventAny *event, gbool
 }
 
 static gboolean edit_ldap_key_pressed( GtkWidget *widget, GdkEventKey *event, gboolean *cancelled ) {
-       if (event && event->keyval == GDK_Escape) {
+       if (event && event->keyval == GDK_KEY_Escape) {
                *cancelled = TRUE;
                gtk_main_quit();
        }
@@ -230,7 +231,7 @@ static void edit_ldap_server_check( void ) {
        sPass = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_bindPW), 0, -1 );
        iPort = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_port ) );
        iTime = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ) );
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        tls = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ldapedit.enable_tls));
        ssl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ldapedit.enable_ssl));
 #endif
@@ -243,7 +244,7 @@ static void edit_ldap_server_check( void ) {
                debug_print("ldap server: %s\nport: %d\nssl: %d\ntls: %d\nbindDN: %s\n", sHost, iPort, ssl, tls, sBind);
                if( ldaputil_test_connect( sHost, iPort, ssl, tls, iTime ) ) {
                        /* Attempt to read base DN */
-                       baseDN = ldaputil_read_basedn( sHost, iPort, sBind, sPass, iTime, ssl, tls );
+                       baseDN = ldaputil_read_basedn(sHost, iPort, sBind, sPass, iTime, ssl, tls);
                        if( baseDN ) {
                                GList *node = baseDN;
                                while( node ) {
@@ -293,7 +294,7 @@ static void edit_ldap_basedn_select( void ) {
        sPass = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_bindPW), 0, -1 );
        iPort = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_port ) );
        iTime = gtk_spin_button_get_value_as_int( GTK_SPIN_BUTTON( ldapedit.spinbtn_timeout ) );
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        tls = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ldapedit.enable_tls));
        ssl = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ldapedit.enable_ssl));
 #endif
@@ -334,7 +335,6 @@ static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
        gtk_container_set_border_width(GTK_CONTAINER(window), 0);
        gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP Server"));
        gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
-       gtk_window_set_modal(GTK_WINDOW(window), TRUE); 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(edit_ldap_delete_event),
                         cancelled);
@@ -397,15 +397,14 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        GtkWidget *entry_name;
        GtkWidget *entry_server;
        GtkWidget *hbox_spin;
-       GtkObject *spinbtn_port_adj;
+       GtkAdjustment *spinbtn_port_adj;
        GtkWidget *spinbtn_port;
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        GtkWidget *enable_ssl_checkbtn, *enable_tls_checkbtn;
 #endif
        GtkWidget *entry_baseDN;
        GtkWidget *check_btn;
        GtkWidget *lookdn_btn;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
@@ -461,23 +460,23 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_port_adj = gtk_adjustment_new (389, 1, 65535, 1, 1000, 1000);
+       spinbtn_port_adj = GTK_ADJUSTMENT(gtk_adjustment_new (389, 1, 65535, 1, 1000, 0));
        spinbtn_port = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_port_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, TRUE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_port, 64, -1);
        gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_port), TRUE);
        
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        enable_tls_checkbtn = gtk_check_button_new_with_label(_("TLS"));
        enable_ssl_checkbtn = gtk_check_button_new_with_label(_("SSL"));
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_tls_checkbtn, enable_ssl_checkbtn);
        SET_TOGGLE_SENSITIVITY_REVERSE(enable_ssl_checkbtn, enable_tls_checkbtn);
        CLAWS_SET_TIP(enable_tls_checkbtn, _( 
-               "Enable secure connection to the LDAP server via TLS."
+               "Enable secure connection to the LDAP server via TLS. "
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
        CLAWS_SET_TIP(enable_ssl_checkbtn, _( 
-               "Enable secure connection to the LDAP server via SSL."
+               "Enable secure connection to the LDAP server via SSL. "
                "If connection fails, be sure to check the correct "
                "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
 
@@ -536,7 +535,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
        ldapedit.entry_server = entry_server;
        ldapedit.spinbtn_port = spinbtn_port;
        ldapedit.entry_baseDN = entry_baseDN;
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        ldapedit.enable_ssl = enable_ssl_checkbtn;
        ldapedit.enable_tls = enable_tls_checkbtn;
 
@@ -551,12 +550,11 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
        GtkWidget *label;
        GtkWidget *entry_criteria;
        GtkWidget *hbox_spin;
-       GtkObject *spinbtn_queryage_adj;
+       GtkAdjustment *spinbtn_queryage_adj;
        GtkWidget *spinbtn_queryage;
        GtkWidget *check_dynsearch;
        GtkWidget *check_matchoption;
        GtkWidget *reset_btn;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
@@ -604,8 +602,8 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_queryage_adj = gtk_adjustment_new(
-               LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 1000 );
+       spinbtn_queryage_adj = GTK_ADJUSTMENT(gtk_adjustment_new(
+               LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 0 ));
        spinbtn_queryage = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_queryage_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_queryage, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_queryage, 64, -1);
@@ -676,11 +674,10 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        GtkWidget *entry_bindDN;
        GtkWidget *entry_bindPW;
        GtkWidget *hbox_spin;
-       GtkObject *spinbtn_timeout_adj;
+       GtkAdjustment *spinbtn_timeout_adj;
        GtkWidget *spinbtn_timeout;
-       GtkObject *spinbtn_maxentry_adj;
+       GtkAdjustment *spinbtn_maxentry_adj;
        GtkWidget *spinbtn_maxentry;
-       CLAWS_TIP_DECL();
        gint top;
 
        vbox = gtk_vbox_new( FALSE, 8 );
@@ -725,10 +722,6 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        gtk_table_attach(GTK_TABLE(table), entry_bindPW, 1, 2, top, (top + 1),
                GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
        gtk_entry_set_visibility(GTK_ENTRY(entry_bindPW), FALSE);
-#ifdef MAEMO
-       hildon_gtk_entry_set_input_mode(GTK_ENTRY(entry_bindPW), 
-               HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE);
-#endif
 
        CLAWS_SET_TIP(entry_bindPW, _( 
                "The password to be used when connecting as the \"Bind DN\" " \
@@ -741,7 +734,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_timeout_adj = gtk_adjustment_new (0, 0, 300, 1, 10, 10);
+       spinbtn_timeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 300, 1, 10, 0));
        spinbtn_timeout = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_timeout_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_timeout, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_timeout, 64, -1);
@@ -759,7 +752,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
        gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
 
        hbox_spin = gtk_hbox_new (FALSE, 8);
-       spinbtn_maxentry_adj = gtk_adjustment_new (0, 0, 500, 1, 10, 10);
+       spinbtn_maxentry_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 500, 1, 10, 0));
        spinbtn_maxentry = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_maxentry_adj), 1, 0);
        gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_maxentry, FALSE, FALSE, 0);
        gtk_widget_set_size_request (spinbtn_maxentry, 64, -1);
@@ -878,7 +871,7 @@ static void edit_ldap_clear_fields(void) {
                GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), TRUE );
        gtk_toggle_button_set_active(
                GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), FALSE );
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        gtk_toggle_button_set_active(
                GTK_TOGGLE_BUTTON( ldapedit.enable_ssl), FALSE );
        gtk_toggle_button_set_active(
@@ -893,6 +886,7 @@ static void edit_ldap_clear_fields(void) {
 static void edit_ldap_set_fields( LdapServer *server ) {
        LdapControl *ctl;
        gchar *crit;
+       gchar *pwd;
 
        if( ldapsvr_get_name( server ) )
                gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_name),
@@ -908,14 +902,16 @@ static void edit_ldap_set_fields( LdapServer *server ) {
        if( ctl->bindDN )
                gtk_entry_set_text(
                        GTK_ENTRY(ldapedit.entry_bindDN), ctl->bindDN );
-       if( ctl->bindPass )
-               gtk_entry_set_text(
-                       GTK_ENTRY(ldapedit.entry_bindPW), ctl->bindPass );
+       if( ctl->bindPass ) {
+               pwd = ldapctl_get_bind_password( ctl );
+               gtk_entry_set_text(     GTK_ENTRY(ldapedit.entry_bindPW),  pwd );
+               g_free(pwd);
+       }
        gtk_spin_button_set_value(
                GTK_SPIN_BUTTON(ldapedit.spinbtn_timeout), ctl->timeOut );
        gtk_spin_button_set_value(
                GTK_SPIN_BUTTON(ldapedit.spinbtn_maxentry), ctl->maxEntries );
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        gtk_toggle_button_set_active(
                GTK_TOGGLE_BUTTON(ldapedit.enable_tls), ctl->enableTLS );
        gtk_toggle_button_set_active(
@@ -967,6 +963,7 @@ AdapterDSource *addressbook_edit_ldap(
        gtk_widget_grab_focus(ldapedit.entry_name);
        gtk_widget_show(ldapedit.window);
        manage_window_set_transient(GTK_WINDOW(ldapedit.window));
+       gtk_window_set_modal(GTK_WINDOW(ldapedit.window), TRUE);
 
        edit_ldap_status_show( "" );
        if( ads ) {
@@ -984,6 +981,7 @@ AdapterDSource *addressbook_edit_ldap(
 
        gtk_main();
        gtk_widget_hide(ldapedit.window);
+       gtk_window_set_modal(GTK_WINDOW(ldapedit.window), FALSE);
        if (cancelled == TRUE) return NULL;
 
        sName = gtk_editable_get_chars(
@@ -1010,7 +1008,7 @@ AdapterDSource *addressbook_edit_ldap(
                        GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) );
        bMatch = gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) );
-#ifdef USE_LDAP_TLS
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
        ssl = gtk_toggle_button_get_active(
                        GTK_TOGGLE_BUTTON( ldapedit.enable_ssl ) );
        tls = gtk_toggle_button_get_active(
@@ -1039,19 +1037,19 @@ AdapterDSource *addressbook_edit_ldap(
                ldapctl_set_host( ctl, sHost );
                ldapctl_set_base_dn( ctl, sBase );
                ldapctl_set_bind_dn( ctl, sBind );
-               ldapctl_set_bind_password( ctl, sPass );
+               ldapctl_set_bind_password( ctl, sPass, TRUE, TRUE );
                ldapctl_set_port( ctl, iPort );
                ldapctl_set_max_entries( ctl, iMaxE );
                ldapctl_set_timeout( ctl, iTime );
                ldapctl_set_max_query_age( ctl, iAge );
-#ifdef USE_LDAP_TLS
                ldapctl_set_tls( ctl, tls );
                ldapctl_set_ssl( ctl, ssl );
-#endif
                ldapctl_set_matching_option(
                        ctl, bMatch ?
                        LDAPCTL_MATCH_CONTAINS : LDAPCTL_MATCH_BEGINWITH );
 
+               addrindex_save_data(addrIndex);
+
                /* Save attributes */
                editldap_parse_criteria( sCrit, ctl );