← Back to branch summary

~ubuntu-branches/ubuntu/lucid/evolution-data-server/lucid-security

« back to all changes in this revision

Viewing changes to libedataserver/e-proxy.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2009-12-16 22:11:22 UTC
  • mfrom: (1.1.76 upstream) (1.2.8 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091216221122-mjwmo4lk4co6sxkb
Tags: 2.28.2-1ubuntu1
https://launchpad.net/bugs/481457
* Resync on Debian
* New upstream version:
  - #602719 - Crash in ep_set_proxy with no proxy user or password
    (lp: #481457)
* debian/control:
  - don't use libgnome
  - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
* debian/libedata-book1.2-dev.install, debian/libebackend-1.2-dev.install,
  debian/libcamel1.2-dev.install, debian/libedataserverui1.2-dev.install:
  - install html documentation
* debian/evolution-data-server.install,
  debian/patches/45_libcamel_providers_version.patch:
  - use the upstream versioning, not a Debian-specific one  
* debian/rules:
  - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
libedataserver/e-proxy.c
638
638
        }
639
639
 
640
640
        if (gconf_client_get_bool (client, RIGHT_KEY (HTTP_USE_AUTH), NULL)) {
641
 
                gchar *proxy_user, *proxy_pw, *tmp;
 
641
                gchar *proxy_user, *proxy_pw, *tmp = NULL;
642
642
 
643
643
                proxy_user = gconf_client_get_string (client, RIGHT_KEY (HTTP_AUTH_USER), NULL);
644
644
                proxy_pw = gconf_client_get_string (client, RIGHT_KEY (HTTP_AUTH_PWD), NULL);
645
645
 
646
 
                tmp = uri_http;
647
 
 
648
 
                uri_http = g_strdup_printf ("http://%s:%s@%s", proxy_user, proxy_pw, tmp + strlen ("http://"));
 
646
                if (proxy_user && *proxy_user && proxy_pw && *proxy_pw) {
 
647
                        tmp = uri_http;
 
648
                        uri_http = g_strdup_printf ("http://%s:%s@%s", proxy_user, proxy_pw, tmp + strlen ("http://"));
 
649
                } else if (proxy_user && *proxy_user) {
 
650
                        /* proxy without password, just try it */
 
651
                        tmp = uri_http;
 
652
                        uri_http = g_strdup_printf ("http://%s@%s", proxy_user, tmp + strlen ("http://"));
 
653
                }
649
654
 
650
655
                g_free (proxy_user);
651
656
                g_free (proxy_pw);