← Back to branch summary

~ubuntu-branches/ubuntu/maverick/evolution-data-server/maverick-proposed

« back to all changes in this revision

Viewing changes to camel/camel-sasl.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 17:02:06 UTC
  • mfrom: (1.1.79 upstream) (1.6.12 experimental)
  • Revision ID: james.westby@ubuntu.com-20100517170206-4ufr52vwrhh26yh0
Tags: 2.30.1-1ubuntu1
https://launchpad.net/bugs/42199
https://launchpad.net/bugs/229669
https://launchpad.net/bugs/173703
https://launchpad.net/bugs/360344
https://launchpad.net/bugs/508494
* Merge from debian experimental. Remaining change:
  (LP: #42199, #229669, #173703, #360344, #508494)
  + debian/control:
    - add Vcs-Bzr tag
    - don't use libgnome
    - Use Breaks instead of Conflicts against evolution 2.25 and earlier.
  + debian/evolution-data-server.install,
    debian/patches/45_libcamel_providers_version.patch:
    - use the upstream versioning, not a Debian-specific one 
  + 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/rules:
    - don't build documentation it's shipped with the tarball

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel-sasl.c
30
30
#include "camel-sasl-cram-md5.h"
31
31
#include "camel-sasl-digest-md5.h"
32
32
#include "camel-sasl-gssapi.h"
33
 
#include "camel-sasl-kerberos4.h"
34
33
#include "camel-sasl-login.h"
35
34
#include "camel-sasl-ntlm.h"
36
35
#include "camel-sasl-plain.h"
201
200
        else if (!strcmp (mechanism, "GSSAPI"))
202
201
                sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_GSSAPI_TYPE);
203
202
#endif
204
 
#ifdef HAVE_KRB4
205
 
        else if (!strcmp (mechanism, "KERBEROS_V4"))
206
 
                sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_KERBEROS4_TYPE);
207
 
#endif
208
203
        else if (!strcmp (mechanism, "PLAIN"))
209
204
                sasl = (CamelSasl *) camel_object_new (CAMEL_SASL_PLAIN_TYPE);
210
205
        else if (!strcmp (mechanism, "LOGIN"))
241
236
#ifdef HAVE_KRB5
242
237
        types = g_list_prepend (types, &camel_sasl_gssapi_authtype);
243
238
#endif
244
 
#ifdef HAVE_KRB4
245
 
        types = g_list_prepend (types, &camel_sasl_kerberos4_authtype);
246
 
#endif
247
239
        types = g_list_prepend (types, &camel_sasl_ntlm_authtype);
248
240
        if (include_plain)
249
241
                types = g_list_prepend (types, &camel_sasl_plain_authtype);
269
261
        else if (!strcmp (mechanism, "GSSAPI"))
270
262
                return &camel_sasl_gssapi_authtype;
271
263
#endif
272
 
#ifdef HAVE_KRB4
273
 
        else if (!strcmp (mechanism, "KERBEROS_V4"))
274
 
                return &camel_sasl_kerberos4_authtype;
275
 
#endif
276
264
        else if (!strcmp (mechanism, "PLAIN"))
277
265
                return &camel_sasl_plain_authtype;
278
266
        else if (!strcmp (mechanism, "LOGIN"))