From 500a46c6b7aca3556b2f77e5448fe7cff83ecae1 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Thu, 18 Apr 2002 22:43:54 +0000 Subject: fill in source->ssl. (addressbook_source_dialog_set_source): set up 2002-04-18 Chris Toshok * gui/component/ldap-config.c (addressbook_dialog_get_source): fill in source->ssl. (addressbook_source_dialog_set_source): set up auth/scope/ssl option menus properly. * gui/component/addressbook-storage.c (addressbook_storage_init_source_uri): always include the limit/ssl in the uri so we don't need to rely on defaults everywhere. (ldap_source_foreach): store the ssl option. * gui/component/addressbook-storage.h: reorder SSLType to match the UI. * backend/pas/pas-backend-ldap.c: (struct _PASBackendLDAPPrivate) add field for ldap_timeout. (pas_backend_ldap_connect): reorder things a bit - we need to start tls before the root dse query, if we can. (pas_backend_ldap_load_uri): track the way ssl parameters are given in the uri, and parse out the timeout. * gui/component/ldap-config.c (port_changed_func): use the symbolic SSL name instead of an integer constant. svn path=/trunk/; revision=16529 --- addressbook/gui/component/addressbook-storage.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'addressbook/gui/component/addressbook-storage.c') diff --git a/addressbook/gui/component/addressbook-storage.c b/addressbook/gui/component/addressbook-storage.c index 2b54c5019e..75a2e2614f 100644 --- a/addressbook/gui/component/addressbook-storage.c +++ b/addressbook/gui/component/addressbook-storage.c @@ -373,13 +373,13 @@ addressbook_storage_init_source_uri (AddressbookSource *source) g_string_sprintfa (str, "%s:%s/%s?"/*trigraph prevention*/"?%s", source->host, source->port, source->rootdn, ldap_unparse_scope (source->scope)); - if (source->limit != 100) - g_string_sprintfa (str, ";limit=%d", source->limit); + g_string_sprintfa (str, ";limit=%d", source->limit); - if (source->ssl != ADDRESSBOOK_LDAP_SSL_WHENEVER_POSSIBLE) - g_string_sprintfa (str, ";ssl=%s", ldap_unparse_ssl (source->ssl)); + g_string_sprintfa (str, ";ssl=%s", ldap_unparse_ssl (source->ssl)); - /* XXX need to do timeout info */ +#if 0 + g_string_sprintfa (str, ";timeout=%d", source->timeout); +#endif source->uri = str->str; @@ -498,6 +498,8 @@ ldap_source_foreach(AddressbookSource *source, xmlNode *root) (xmlChar *) ldap_unparse_scope(source->scope)); xmlNewChild (source_root, NULL, (xmlChar *) "authmethod", (xmlChar *) ldap_unparse_auth(source->auth)); + xmlNewChild (source_root, NULL, (xmlChar *) "ssl", + (xmlChar *) ldap_unparse_ssl(source->ssl)); if (source->limit != 100) { char *string; -- cgit v1.2.3