diff options
| author | Chris Toshok <toshok@ximian.com> | 2002-04-19 06:43:54 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2002-04-19 06:43:54 +0800 |
| commit | 500a46c6b7aca3556b2f77e5448fe7cff83ecae1 (patch) | |
| tree | 48168342b44a1c22ac6048a8491da1064a505b10 /addressbook/gui/component/addressbook-storage.c | |
| parent | 7397bc24b8b776af4c46d13d2ac77d0e063bc853 (diff) | |
| download | gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar.gz gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar.bz2 gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar.lz gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar.xz gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.tar.zst gsoc2013-evolution-500a46c6b7aca3556b2f77e5448fe7cff83ecae1.zip | |
fill in source->ssl. (addressbook_source_dialog_set_source): set up
2002-04-18 Chris Toshok <toshok@ximian.com>
* 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
Diffstat (limited to 'addressbook/gui/component/addressbook-storage.c')
| -rw-r--r-- | addressbook/gui/component/addressbook-storage.c | 12 |
1 files changed, 7 insertions, 5 deletions
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; |