From 17d6ee994369ec0acf4e30cf74d251522a109890 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 1 Mar 2001 22:39:52 +0000 Subject: Add an "authtypes" hash table to CamelImapStore recording the supported * providers/imap/camel-imap-store.c: Add an "authtypes" hash table to CamelImapStore recording the supported authtypes. (connect_to_server): Record supported authtypes in the authtypes hash rather than the capabilities bitmask, since now the IMAP code is no longer responsible for keeping track of which authtypes we support. (query_auth_types): Use camel_sasl_authtype_list to get the SASL-supported authtypes. (try_auth): New function to try a SASL auth mechanism. Sort of formerly imap_try_kerberos_v4_auth. (imap_connect): Get rid of the krb4-specific bits and genericize them for any SASL authtype. * providers/imap/Makefile.am: Remove camel-imap-auth.[ch] (moved into camel-imap-store.c since it's now constant size) and the KRB4_CFLAGS and KRB4_LDFLAGS references. svn path=/trunk/; revision=8463 --- camel/providers/imap/camel-imap-store.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'camel/providers/imap/camel-imap-store.h') diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h index a24723b657..3792e92872 100644 --- a/camel/providers/imap/camel-imap-store.h +++ b/camel/providers/imap/camel-imap-store.h @@ -50,10 +50,8 @@ typedef enum { #define IMAP_CAPABILITY_IMAP4REV1 (1 << 1) #define IMAP_CAPABILITY_STATUS (1 << 2) #define IMAP_CAPABILITY_NAMESPACE (1 << 3) -#define IMAP_CAPABILITY_AUTH_KERBEROS_V4 (1 << 4) -#define IMAP_CAPABILITY_AUTH_GSSAPI (1 << 5) -#define IMAP_CAPABILITY_UIDPLUS (1 << 6) -#define IMAP_CAPABILITY_LITERALPLUS (1 << 7) +#define IMAP_CAPABILITY_UIDPLUS (1 << 4) +#define IMAP_CAPABILITY_LITERALPLUS (1 << 5) struct _CamelImapStore { CamelRemoteStore parent_object; @@ -65,6 +63,7 @@ struct _CamelImapStore { CamelImapServerLevel server_level; guint32 capabilities; + GHashTable *authtypes; char *namespace, dir_sep, *storage_path, *base_url; -- cgit v1.2.3