/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2001-2003 Match Grun
+ * Copyright (C) 2001-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
*/
/*
#include "editldap_basedn.h"
#include "manage_window.h"
#include "gtkutils.h"
+#include "prefs_gtk.h"
#define PAGE_BASIC 0
#define PAGE_SEARCH 1
GtkWidget *spinbtn_queryage;
GtkWidget *check_dynsearch;
GtkWidget *check_matchoption;
+#ifdef USE_LDAP_TLS
+ GtkWidget *enable_ssl;
+ GtkWidget *enable_tls;
+#endif
} ldapedit;
/**
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 ) );
+#ifdef USE_LDAP_TLS
+ 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_strchomp( sHost ); g_strchug( sHost );
g_strchomp( sBind ); g_strchug( sBind );
g_strchomp( sPass ); g_strchug( sPass );
if( *sHost != '\0' ) {
/* Test connection to server */
- if( ldaputil_test_connect( sHost, iPort ) ) {
+ if( ldaputil_test_connect( sHost, iPort, ssl, tls ) ) {
/* 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 ) {
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 ) );
+#ifdef USE_LDAP_TLS
+ 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_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 );
+ 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() {
+ gtk_entry_set_text(GTK_ENTRY(ldapedit.entry_criteria), ldapctl_get_default_criteria());
}
static void addressbook_edit_ldap_dialog_create( gboolean *cancelled ) {
GtkWidget *hsbox;
GtkWidget *statusbar;
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ 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_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 );
+}
+
static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *vbox;
GtkWidget *table;
GtkWidget *hbox_spin;
GtkObject *spinbtn_port_adj;
GtkWidget *spinbtn_port;
+#ifdef USE_LDAP_TLS
+ GtkWidget *enable_ssl_checkbtn, *enable_tls_checkbtn;
+#endif
GtkWidget *entry_baseDN;
GtkWidget *check_btn;
GtkWidget *lookdn_btn;
"\"ldap.mydomain.com\" may be appropriate for the " \
"\"mydomain.com\" organization. An IP address may also be " \
"used. You may specify \"localhost\" if running an LDAP " \
- "server on the same computer as Sylpheed." ),
+ "server on the same computer as Claws Mail." ),
NULL );
/* Next row */
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_new (389, 1, 65535, 1, 1000, 1000);
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);
+
+#ifdef USE_LDAP_TLS
+ 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);
+ gtk_tooltips_set_tip( toolTip, 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)." ),
+ NULL );
+ gtk_tooltips_set_tip( toolTip, 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)." ),
+ NULL );
+
+ 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);
gtk_tooltips_set_tip( toolTip, 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"
),
ldapedit.entry_server = entry_server;
ldapedit.spinbtn_port = spinbtn_port;
ldapedit.entry_baseDN = entry_baseDN;
+#ifdef USE_LDAP_TLS
+ 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 ) {
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_criteria = gtk_entry_new();
+ gtk_editable_set_editable(GTK_EDITABLE(entry_criteria), FALSE);
gtk_table_attach(GTK_TABLE(table), entry_criteria, 1, 2, top, (top + 1),
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
gtk_tooltips_set_tip( toolTip, 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\". " \
+ "is typically formatted as: \"cn=user,dc=claws-mail,dc=org\". " \
"This is usually left empty when performing a search." ),
NULL );
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() {
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_get_default_criteria());
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 );
+#ifdef USE_LDAP_TLS
+ 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->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_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
+ 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_WINDOW(ldapedit.window), _("Edit LDAP Server"));
}
else {
- edit_ldap_clear_fields();
+ edit_ldap_clear_fields(NULL);
gtk_window_set_title(
GTK_WINDOW(ldapedit.window), _("Add New LDAP Server"));
}
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) );
bMatch = gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) );
-
+#ifdef USE_LDAP_TLS
+ 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
fin = FALSE;
if( *sName == '\0' ) fin = TRUE;
if( *sHost == '\0' ) fin = TRUE;
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 );
projects / claws.git / blobdiff