014ed35be5
* camel-service.h: Remove the "quick_login" member, which is unnecessary. * providers/smtp/camel-smtp-transport.c (smtp_auth): Remove the references to quick_login and fix this to use the CamelSasl interfaces correctly to do the same thing. (connect_to_server): Split this out of smtp_connect (smtp_connect): Use connect_to_server. When re-EHLO'ing after auth, ignore errors. (query_auth_types): Use connect_to_server rather than smtp_connect, so it doesn't try to authenticate. Add LOGIN authtype to the list of authtypes to check for. * providers/smtp/camel-smtp-provider.c (camel_provider_module_init): Add LOGIN authtype to the authtypes list explicitly. * camel-sasl.c (camel_sasl_authtype_list): Don't list LOGIN here: it's not a real SASL authtype and is only used for SMTP. * camel-sasl-plain.c: * camel-sasl-login.c: * camel-sasl-kerberos4.c: * camel-sasl-cram-md5.c: * camel-sasl-anonymous.c: * providers/pop3/camel-pop3-provider.c: Remove "quick_login" argument from authtypes. svn path=/trunk/; revision=9100
105 lines
2.8 KiB
C
105 lines
2.8 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
|
|
/*
|
|
* Authors: Jeffrey Stedfast <fejj@ximian.com>
|
|
*
|
|
* Copyright 2001 Ximian, Inc. (www.ximian.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
|
|
*
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include <config.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include "camel-sasl-plain.h"
|
|
#include "camel-service.h"
|
|
|
|
CamelServiceAuthType camel_sasl_plain_authtype = {
|
|
N_("Password"),
|
|
|
|
N_("This option will connect to the server using a "
|
|
"simple password."),
|
|
|
|
"PLAIN",
|
|
TRUE
|
|
};
|
|
|
|
static CamelSaslClass *parent_class = NULL;
|
|
|
|
/* Returns the class for a CamelSaslPlain */
|
|
#define CSP_CLASS(so) CAMEL_SASL_PLAIN_CLASS (CAMEL_OBJECT_GET_CLASS (so))
|
|
|
|
static GByteArray *plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex);
|
|
|
|
static void
|
|
camel_sasl_plain_class_init (CamelSaslPlainClass *camel_sasl_plain_class)
|
|
{
|
|
CamelSaslClass *camel_sasl_class = CAMEL_SASL_CLASS (camel_sasl_plain_class);
|
|
|
|
parent_class = CAMEL_SASL_CLASS (camel_type_get_global_classfuncs (camel_sasl_get_type ()));
|
|
|
|
/* virtual method overload */
|
|
camel_sasl_class->challenge = plain_challenge;
|
|
}
|
|
|
|
CamelType
|
|
camel_sasl_plain_get_type (void)
|
|
{
|
|
static CamelType type = CAMEL_INVALID_TYPE;
|
|
|
|
if (type == CAMEL_INVALID_TYPE) {
|
|
type = camel_type_register (camel_sasl_get_type (),
|
|
"CamelSaslPlain",
|
|
sizeof (CamelSaslPlain),
|
|
sizeof (CamelSaslPlainClass),
|
|
(CamelObjectClassInitFunc) camel_sasl_plain_class_init,
|
|
NULL,
|
|
NULL,
|
|
NULL);
|
|
}
|
|
|
|
return type;
|
|
}
|
|
|
|
static GByteArray *
|
|
plain_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
|
|
{
|
|
GByteArray *buf = NULL;
|
|
CamelURL *url = sasl->service->url;
|
|
|
|
#if 0
|
|
if (token) {
|
|
camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
|
|
_("Authentication failed."));
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
g_return_val_if_fail (url->passwd != NULL, NULL);
|
|
|
|
/* FIXME: make sure these are "UTF8-SAFE" */
|
|
buf = g_byte_array_new ();
|
|
g_byte_array_append (buf, "", 1);
|
|
g_byte_array_append (buf, url->user, strlen (url->user));
|
|
g_byte_array_append (buf, "", 1);
|
|
g_byte_array_append (buf, url->passwd, strlen (url->passwd));
|
|
|
|
sasl->authenticated = TRUE;
|
|
|
|
return buf;
|
|
}
|