/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Match Grun
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2001-2015 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
#ifdef HAVE_CONFIG_H
# include "config.h"
+#include "claws-features.h"
#endif
#ifdef USE_LDAP
#include "defs.h"
#include <glib.h>
+#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkbutton.h>
-
-#include "intl.h"
+#include <gtk/gtk.h>
+
#include "addressbook.h"
#include "prefs_common.h"
#include "addressitem.h"
#include "editldap_basedn.h"
#include "manage_window.h"
#include "gtkutils.h"
+#include "prefs_gtk.h"
+#include "passwordstore.h"
#define PAGE_BASIC 0
#define PAGE_SEARCH 1
GtkWidget *spinbtn_queryage;
GtkWidget *check_dynsearch;
GtkWidget *check_matchoption;
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
+ GtkWidget *enable_ssl;
+ GtkWidget *enable_tls;
+#endif
} ldapedit;
/**
gint i;
gboolean errorFlag;
+ cm_return_val_if_fail(criteria != NULL, TRUE);
+
errorFlag = TRUE;
/* Replace delimiters with spaces */
*ptr = ' ';
ptr++;
}
+ debug_print("cleaned criteria list: %s\n", criteria);
/* Parse string */
splitStr = g_strsplit( criteria, " ", 0 );
static gboolean edit_ldap_validate( void ) {
gchar *str;
gboolean errorFlag;
- gint page;
+ gint page = 0;
errorFlag = FALSE;
str = gtk_editable_get_chars(
}
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();
}
gchar *sBaseDN = NULL;
gint iBaseDN = 0;
gboolean flg;
+ gboolean tls = FALSE, ssl = FALSE;
GList *baseDN = NULL;
edit_ldap_status_show( "" );
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 ) );
- g_strchomp( sHost ); g_strchug( sHost );
- g_strchomp( sBind ); g_strchug( sBind );
- g_strchomp( sPass ); g_strchug( sPass );
+#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
+
+ g_strstrip( sHost );
+ g_strstrip( sBind );
+ g_strstrip( sPass );
if( *sHost != '\0' ) {
/* Test connection to server */
- if( ldaputil_test_connect( sHost, iPort ) ) {
+ 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 );
+ baseDN = ldaputil_read_basedn(sHost, iPort, sBind, sPass, iTime, ssl, tls);
if( baseDN ) {
GList *node = baseDN;
while( node ) {
}
mgu_free_dlist( baseDN );
baseDN = node = NULL;
+ flg = TRUE;
+ } else {
+ flg = FALSE;
}
- flg = TRUE;
}
}
g_free( sHost );
if( sBaseDN ) {
/* Load search DN */
+ debug_print("baseDN: %s\n", sBaseDN);
gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), sBaseDN);
g_free( sBaseDN );
}
static void edit_ldap_basedn_select( void ) {
gchar *sHost, *sBind, *sPass, *sBase;
- gint iPort, iTime;
+ gint iPort, iTime, tls = 0, ssl = 0;
gchar *selectDN;
sHost = gtk_editable_get_chars( GTK_EDITABLE(ldapedit.entry_server), 0, -1 );
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 ) );
- g_strchomp( sHost ); g_strchug( sHost );
- g_strchomp( sBind ); g_strchug( sBind );
- g_strchomp( sPass ); g_strchug( sPass );
- selectDN = edit_ldap_basedn_selection( sHost, iPort, sBase, iTime, sBind, sPass );
+#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
+
+ g_strstrip( sHost );
+ g_strstrip( sBind );
+ g_strstrip( sPass );
+ debug_print("ldap server: %s\nport: %d\nssl: %d\ntls: %d\nbindDN: %s\n", sHost, iPort, ssl, tls, sBind);
+ selectDN = edit_ldap_basedn_selection( sHost, iPort, sBase, iTime, sBind, sPass, ssl, tls );
if( selectDN ) {
gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_baseDN), selectDN);
g_free( selectDN );
g_free( sPass );
}
-static void edit_ldap_search_reset( void ) {
- gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST );
+static void edit_ldap_search_reset(void) {
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST);
}
static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
GtkWidget *hsbox;
GtkWidget *statusbar;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ debug_print("creating edit_ldap_dialog\n");
+ window = gtkut_window_new(GTK_WINDOW_TOPLEVEL, "editldap");
gtk_widget_set_size_request(window, 450, -1);
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);
gtk_box_pack_start(GTK_BOX(hsbox), statusbar, TRUE, TRUE, BORDER_WIDTH);
/* Button panel */
- gtkut_stock_button_set_create(&hbbox, &ok_btn, GTK_STOCK_OK,
- &cancel_btn, GTK_STOCK_CANCEL,
+ gtkut_stock_button_set_create(&hbbox, &cancel_btn, GTK_STOCK_CANCEL,
+ &ok_btn, GTK_STOCK_OK,
NULL, NULL);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
GTK_STATUSBAR(statusbar), "Edit LDAP Server Dialog" );
}
+static void editldap_update_port (GtkToggleButton *ssl_btn, gpointer data) {
+ gboolean val = gtk_toggle_button_get_active(ssl_btn);
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON( ldapedit.spinbtn_port ),
+ val ? LDAPCTL_DFL_SSL_PORT:LDAPCTL_DFL_PORT );
+ debug_print("Setting port: %d\n", val ? LDAPCTL_DFL_SSL_PORT:LDAPCTL_DFL_PORT);
+}
+
static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *entry_name;
GtkWidget *entry_server;
GtkWidget *hbox_spin;
- GtkObject *spinbtn_port_adj;
+ GtkAdjustment *spinbtn_port_adj;
GtkWidget *spinbtn_port;
+#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;
- GtkTooltips *toolTip;
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
gtk_table_attach(GTK_TABLE(table), entry_name, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_name, _(
- "A name that you wish to call the server." ),
- NULL );
+ CLAWS_SET_TIP(entry_name, _(
+ "A name that you wish to call the server." ));
/* Next row */
++top;
gtk_table_attach(GTK_TABLE(table), entry_server, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_server, _(
+ CLAWS_SET_TIP(entry_server, _(
"This is the hostname of the server. For example, " \
- "\"ldap.mydomain.com\" may be appropriate for the " \
- "\"mydomain.com\" organization. An IP address may also be " \
+ "\"ldap.example.org\" may be appropriate for the " \
+ "\"exmaple.org\" organization. An IP address may also be " \
"used. You may specify \"localhost\" if running an LDAP " \
- "server on the same computer as Sylpheed." ),
- NULL );
+ "server on the same computer as Claws Mail." ));
/* Next row */
++top;
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, 100, 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, FALSE, FALSE, 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);
+
+#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. "
+ "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. "
+ "If connection fails, be sure to check the correct "
+ "configuration in ldap.conf (TLS_CACERTDIR and TLS_REQCERT fields)." ));
+
+ gtk_box_pack_start (GTK_BOX (hbox_spin), enable_tls_checkbtn, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox_spin), enable_ssl_checkbtn, TRUE, FALSE, 0);
+#endif
+
gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, spinbtn_port, _(
+ CLAWS_SET_TIP(spinbtn_port, _(
"The port number that the server listens on. Port 389 is " \
- "the default." ),
- NULL );
+ "the default." ));
check_btn = gtk_button_new_with_label( _(" Check Server "));
gtk_table_attach(GTK_TABLE(table), check_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, check_btn, _(
- "Press this button to test the connection to the server." ),
- NULL );
+ CLAWS_SET_TIP(check_btn, _(
+ "Press this button to test the connection to the server." ));
/* Next row */
++top;
gtk_table_attach(GTK_TABLE(table), entry_baseDN, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_baseDN, _(
+ CLAWS_SET_TIP(entry_baseDN, _(
"This specifies the name of the directory to be searched " \
"on the server. Examples include:\n" \
- " dc=sylpheed,dc=org\n" \
+ " dc=claws-mail,dc=org\n" \
" ou=people,dc=domainname,dc=com\n" \
" o=Organization Name,c=Country\n"
- ),
- NULL );
+ ));
- lookdn_btn = gtk_button_new_with_label( _(" ... "));
+ lookdn_btn = gtkut_get_browse_file_btn(_("_Browse"));
gtk_table_attach(GTK_TABLE(table), lookdn_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, lookdn_btn, _(
+ CLAWS_SET_TIP(lookdn_btn, _(
"Press this button to lookup the name of available " \
- "directory names on the server." ),
- NULL );
+ "directory names on the server." ));
/* Signal handlers */
g_signal_connect(G_OBJECT(check_btn), "clicked",
ldapedit.entry_server = entry_server;
ldapedit.spinbtn_port = spinbtn_port;
ldapedit.entry_baseDN = entry_baseDN;
+#if (defined USE_LDAP_TLS || defined G_OS_WIN32)
+ ldapedit.enable_ssl = enable_ssl_checkbtn;
+ ldapedit.enable_tls = enable_tls_checkbtn;
+
+ g_signal_connect(G_OBJECT(enable_ssl_checkbtn), "toggled", \
+ G_CALLBACK(editldap_update_port), NULL);
+#endif
}
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;
- GtkTooltips *toolTip;
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
gtk_table_attach(GTK_TABLE(table), entry_criteria, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_criteria, _(
+ CLAWS_SET_TIP(entry_criteria, _(
"A list of LDAP attribute names that should be searched " \
- "when attempting to find a name or address." ),
- NULL );
+ "when attempting to find a name or address." ));
reset_btn = gtk_button_new_with_label( _(" Defaults "));
gtk_table_attach(GTK_TABLE(table), reset_btn, 2, 3, top, (top + 1), GTK_FILL, 0, 3, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, reset_btn, _(
+ CLAWS_SET_TIP(reset_btn, _(
"This resets the attribute names to a default value " \
"that should find most names and addresses during a " \
- "name or address search process." ),
- NULL );
+ "name or address search process." ));
/* Next row */
++top;
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);
gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, spinbtn_queryage, _(
+ CLAWS_SET_TIP(spinbtn_queryage, _(
"This defines the maximum period of time (in seconds) that " \
"an address search result is valid for address completion " \
"purposes. Search results are stored in a cache until this " \
"servers. A larger value will reduce the search time for " \
"subsequent searches. This is useful for servers that have " \
"slow response times at the expense of more memory to cache " \
- "results." ),
- NULL );
+ "results." ));
/* Next row */
++top;
gtk_table_attach(GTK_TABLE(table), check_dynsearch, 1, 3, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, check_dynsearch, _(
+ CLAWS_SET_TIP(check_dynsearch, _(
"Check this option to include this server for dynamic " \
- "searches when using address completion." ),
- NULL );
+ "searches when using address completion." ));
/* Next row */
++top;
gtk_table_attach(GTK_TABLE(table), check_matchoption, 1, 3, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, check_matchoption, _(
+ CLAWS_SET_TIP(check_matchoption, _(
"Searches for names and addresses can be performed either " \
"using \"begins-with\" or \"contains\" search term. Check " \
"this option to perform a \"contains\" search; this type of " \
"performance reasons, address completion uses " \
"\"begins-with\" for all searches against other address " \
"interfaces." \
- ),
- NULL );
+ ));
/* Signal handlers */
g_signal_connect(G_OBJECT(reset_btn), "clicked",
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;
- GtkTooltips *toolTip;
gint top;
vbox = gtk_vbox_new( FALSE, 8 );
gtk_table_attach(GTK_TABLE(table), entry_bindDN, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_bindDN, _(
+ CLAWS_SET_TIP(entry_bindDN, _(
"The LDAP user account name to be used to connect to the server. " \
"This is usually only used for protected servers. This name " \
- "is typically formatted as: \"cn=user,dc=sylpheed,dc=com\". " \
- "This is usually left empty when performing a search." ),
- NULL );
+ "is typically formatted as: \"cn=user,dc=claws-mail,dc=org\". " \
+ "This is usually left empty when performing a search." ));
/* Next row */
++top;
entry_bindPW = gtk_entry_new();
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);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, entry_bindPW, _(
+ CLAWS_SET_TIP(entry_bindPW, _(
"The password to be used when connecting as the \"Bind DN\" " \
- "user." ),
- NULL );
+ "user." ));
/* Next row */
++top;
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);
gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, spinbtn_timeout, _(
- "The timeout period in seconds." ), NULL );
+ CLAWS_SET_TIP(spinbtn_timeout, _(
+ "The timeout period in seconds." ));
/* Next row */
++top;
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);
gtk_table_attach(GTK_TABLE(table), hbox_spin, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
- toolTip = gtk_tooltips_new();
- gtk_tooltips_set_tip( toolTip, spinbtn_maxentry, _(
+ CLAWS_SET_TIP(spinbtn_maxentry, _(
"The maximum number of entries that should be returned " \
- "in the search result." ),
- NULL );
+ "in the search result." ));
/* Done */
gtk_widget_show_all(vbox);
gtk_widget_show_all( ldapedit.window );
}
-void edit_ldap_set_optmenu( GtkOptionMenu *optmenu, const gint value ) {
- GList *cur;
- GtkWidget *menu;
- GtkWidget *menuitem;
- gint menuVal;
- gint n = 0;
-
- g_return_if_fail(optmenu != NULL);
-
- menu = gtk_option_menu_get_menu(optmenu);
- for( cur = GTK_MENU_SHELL(menu)->children; cur != NULL; cur = cur->next ) {
- menuitem = GTK_WIDGET(cur->data);
- menuVal = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "user_data"));
- if( menuVal == value ) {
- gtk_option_menu_set_history(optmenu, n);
- return;
- }
- n++;
- }
- gtk_option_menu_set_history(optmenu, 0);
-}
-
-gint edit_ldap_get_optmenu( GtkOptionMenu *optmenu ) {
- GtkWidget *menu;
- GtkWidget *menuitem;
-
- g_return_val_if_fail(optmenu != NULL, -1);
-
- menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(optmenu));
- menuitem = gtk_menu_get_active(GTK_MENU(menu));
- return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "user_data"));
-}
-
/**
* Format criteria list for display.
* \param ctl Control object.
/**
* Clear entry fields to reasonable defaults (for a new server entry).
*/
-static void edit_ldap_clear_fields( void ) {
+static void edit_ldap_clear_fields(void) {
gtk_entry_set_text(
GTK_ENTRY(ldapedit.entry_name), ADDRESSBOOK_GUESS_LDAP_NAME );
gtk_entry_set_text(
gtk_spin_button_set_value(
GTK_SPIN_BUTTON( ldapedit.spinbtn_maxentry ), LDAPCTL_DFL_TIMEOUT );
gtk_entry_set_text(
- GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST );
+ GTK_ENTRY(ldapedit.entry_criteria), LDAPCTL_DFL_ATTR_LIST);
gtk_spin_button_set_value(
GTK_SPIN_BUTTON(ldapedit.spinbtn_queryage), LDAPCTL_DFL_QUERY_AGE );
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), TRUE );
gtk_toggle_button_set_active(
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), FALSE );
+#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(
+ GTK_TOGGLE_BUTTON( ldapedit.enable_tls), FALSE );
+#endif
}
/**
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 );
- gtk_spin_button_set_value(
- GTK_SPIN_BUTTON(ldapedit.spinbtn_port), ctl->port );
+ gtk_entry_set_text( GTK_ENTRY(ldapedit.entry_bindPW),
+ passwd_store_get(PWS_CORE, "LDAP", ctl->hostName));
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 );
-
+#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(
+ GTK_TOGGLE_BUTTON(ldapedit.enable_ssl), ctl->enableSSL );
+#endif
+ gtk_spin_button_set_value(
+ GTK_SPIN_BUTTON(ldapedit.spinbtn_port), ctl->port );
/* Format criteria */
crit = editldap_build_criteria_list( ctl );
if( crit ) {
AddressDataSource *ds = NULL;
LdapServer *server = NULL;
LdapControl *ctl = NULL;
- gboolean fin;
+ gboolean fin, ssl = FALSE, tls = FALSE;
if (!ldapedit.window)
addressbook_edit_ldap_create(&cancelled);
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 ) {
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(
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) );
bMatch = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) );
-
+#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(
+ 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);
fin = FALSE;
if( *sName == '\0' ) fin = TRUE;
if( *sHost == '\0' ) fin = TRUE;
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_port( ctl, iPort );
ldapctl_set_max_entries( ctl, iMaxE );
ldapctl_set_timeout( ctl, iTime );
ldapctl_set_max_query_age( ctl, iAge );
+ ldapctl_set_tls( ctl, tls );
+ ldapctl_set_ssl( ctl, ssl );
ldapctl_set_matching_option(
ctl, bMatch ?
LDAPCTL_MATCH_CONTAINS : LDAPCTL_MATCH_BEGINWITH );
+ addrindex_save_data(addrIndex);
+
+ passwd_store_set(PWS_CORE, "LDAP", sHost, sPass, FALSE);
+ passwd_store_write_config();
+
/* Save attributes */
editldap_parse_criteria( sCrit, ctl );
g_free( sHost );
g_free( sBase );
g_free( sBind );
- g_free( sPass );
g_free( sCrit );
+ if (sPass != NULL && strlen(sPass) > 0)
+ memset(sPass, 0, strlen(sPass));
+ g_free( sPass );
+
return ads;
}
projects / claws.git / blobdiff