Lines 76-81
static struct _LDAPEdit {
Link Here
|
76 |
GtkWidget *spinbtn_queryage; |
76 |
GtkWidget *spinbtn_queryage; |
77 |
GtkWidget *check_dynsearch; |
77 |
GtkWidget *check_dynsearch; |
78 |
GtkWidget *check_matchoption; |
78 |
GtkWidget *check_matchoption; |
|
|
79 |
GtkWidget *check_referrals; |
79 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
80 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
80 |
GtkWidget *enable_ssl; |
81 |
GtkWidget *enable_ssl; |
81 |
GtkWidget *enable_tls; |
82 |
GtkWidget *enable_tls; |
Lines 556-561
static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
Link Here
|
556 |
GtkWidget *spinbtn_queryage; |
557 |
GtkWidget *spinbtn_queryage; |
557 |
GtkWidget *check_dynsearch; |
558 |
GtkWidget *check_dynsearch; |
558 |
GtkWidget *check_matchoption; |
559 |
GtkWidget *check_matchoption; |
|
|
560 |
GtkWidget *check_referrals; |
559 |
GtkWidget *reset_btn; |
561 |
GtkWidget *reset_btn; |
560 |
gint top; |
562 |
gint top; |
561 |
|
563 |
|
Lines 656-661
static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
Link Here
|
656 |
"interfaces." \ |
658 |
"interfaces." \ |
657 |
)); |
659 |
)); |
658 |
|
660 |
|
|
|
661 |
/* Next row */ |
662 |
++top; |
663 |
check_referrals = gtk_check_button_new_with_label( |
664 |
_("Follow referrals") ); |
665 |
gtk_table_attach(GTK_TABLE(table), check_referrals, 1, 3, top, (top + 1), |
666 |
GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0); |
667 |
|
668 |
CLAWS_SET_TIP(check_referrals, _( |
669 |
"Automatically follow referrals returned by LDAP servers")); |
670 |
|
659 |
/* Signal handlers */ |
671 |
/* Signal handlers */ |
660 |
g_signal_connect(G_OBJECT(reset_btn), "clicked", |
672 |
g_signal_connect(G_OBJECT(reset_btn), "clicked", |
661 |
G_CALLBACK(edit_ldap_search_reset), NULL); |
673 |
G_CALLBACK(edit_ldap_search_reset), NULL); |
Lines 667-672
static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
Link Here
|
667 |
ldapedit.spinbtn_queryage = spinbtn_queryage; |
679 |
ldapedit.spinbtn_queryage = spinbtn_queryage; |
668 |
ldapedit.check_dynsearch = check_dynsearch; |
680 |
ldapedit.check_dynsearch = check_dynsearch; |
669 |
ldapedit.check_matchoption = check_matchoption; |
681 |
ldapedit.check_matchoption = check_matchoption; |
|
|
682 |
ldapedit.check_referrals = check_referrals; |
670 |
} |
683 |
} |
671 |
|
684 |
|
672 |
static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) { |
685 |
static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl ) { |
Lines 872-877
static void edit_ldap_clear_fields(void) {
Link Here
|
872 |
gtk_toggle_button_set_active( |
885 |
gtk_toggle_button_set_active( |
873 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), TRUE ); |
886 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), TRUE ); |
874 |
gtk_toggle_button_set_active( |
887 |
gtk_toggle_button_set_active( |
|
|
888 |
GTK_TOGGLE_BUTTON( ldapedit.check_referrals), TRUE ); |
889 |
gtk_toggle_button_set_active( |
875 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), FALSE ); |
890 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), FALSE ); |
876 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
891 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
877 |
gtk_toggle_button_set_active( |
892 |
gtk_toggle_button_set_active( |
Lines 935-940
static void edit_ldap_set_fields( LdapServer *server ) {
Link Here
|
935 |
gtk_toggle_button_set_active( |
950 |
gtk_toggle_button_set_active( |
936 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), server->searchFlag ); |
951 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch), server->searchFlag ); |
937 |
gtk_toggle_button_set_active( |
952 |
gtk_toggle_button_set_active( |
|
|
953 |
GTK_TOGGLE_BUTTON( ldapedit.check_referrals), ctl->enableReferrals ); |
954 |
gtk_toggle_button_set_active( |
938 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), |
955 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption), |
939 |
( ctl->matchingOption == LDAPCTL_MATCH_CONTAINS ) ); |
956 |
( ctl->matchingOption == LDAPCTL_MATCH_CONTAINS ) ); |
940 |
} |
957 |
} |
Lines 952-958
AdapterDSource *addressbook_edit_ldap(
Link Here
|
952 |
static gboolean cancelled; |
969 |
static gboolean cancelled; |
953 |
gchar *sName, *sHost, *sBase, *sBind, *sPass, *sCrit; |
970 |
gchar *sName, *sHost, *sBase, *sBind, *sPass, *sCrit; |
954 |
gint iPort, iMaxE, iTime, iAge; |
971 |
gint iPort, iMaxE, iTime, iAge; |
955 |
gboolean bSrch, bMatch; |
972 |
gboolean bSrch, bMatch, bReferrals; |
956 |
AddressDataSource *ds = NULL; |
973 |
AddressDataSource *ds = NULL; |
957 |
LdapServer *server = NULL; |
974 |
LdapServer *server = NULL; |
958 |
LdapControl *ctl = NULL; |
975 |
LdapControl *ctl = NULL; |
Lines 1010-1015
AdapterDSource *addressbook_edit_ldap(
Link Here
|
1010 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) ); |
1027 |
GTK_TOGGLE_BUTTON( ldapedit.check_dynsearch ) ); |
1011 |
bMatch = gtk_toggle_button_get_active( |
1028 |
bMatch = gtk_toggle_button_get_active( |
1012 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) ); |
1029 |
GTK_TOGGLE_BUTTON( ldapedit.check_matchoption ) ); |
|
|
1030 |
bReferrals = gtk_toggle_button_get_active( |
1031 |
GTK_TOGGLE_BUTTON( ldapedit.check_referrals ) ); |
1013 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
1032 |
#if (defined USE_LDAP_TLS || defined G_OS_WIN32) |
1014 |
ssl = gtk_toggle_button_get_active( |
1033 |
ssl = gtk_toggle_button_get_active( |
1015 |
GTK_TOGGLE_BUTTON( ldapedit.enable_ssl ) ); |
1034 |
GTK_TOGGLE_BUTTON( ldapedit.enable_ssl ) ); |
Lines 1046-1051
AdapterDSource *addressbook_edit_ldap(
Link Here
|
1046 |
ldapctl_set_max_query_age( ctl, iAge ); |
1065 |
ldapctl_set_max_query_age( ctl, iAge ); |
1047 |
ldapctl_set_tls( ctl, tls ); |
1066 |
ldapctl_set_tls( ctl, tls ); |
1048 |
ldapctl_set_ssl( ctl, ssl ); |
1067 |
ldapctl_set_ssl( ctl, ssl ); |
|
|
1068 |
ldapctl_set_referrals( ctl, bReferrals ); |
1049 |
ldapctl_set_matching_option( |
1069 |
ldapctl_set_matching_option( |
1050 |
ctl, bMatch ? |
1070 |
ctl, bMatch ? |
1051 |
LDAPCTL_MATCH_CONTAINS : LDAPCTL_MATCH_BEGINWITH ); |
1071 |
LDAPCTL_MATCH_CONTAINS : LDAPCTL_MATCH_BEGINWITH ); |