[evolution-data-server] CamelSaslDigestMd5: Use camel_service_get_password().
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] CamelSaslDigestMd5: Use camel_service_get_password().
- Date: Mon, 26 Sep 2011 13:45:44 +0000 (UTC)
commit e225bf9619056e343aaf56205853d0703f155100
Author: Matthew Barnes <mbarnes redhat com>
Date: Sun Sep 25 18:27:58 2011 -0400
CamelSaslDigestMd5: Use camel_service_get_password().
camel/camel-sasl-digest-md5.c | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/camel/camel-sasl-digest-md5.c b/camel/camel-sasl-digest-md5.c
index 84e5389..dd0cdce 100644
--- a/camel/camel-sasl-digest-md5.c
+++ b/camel/camel-sasl-digest-md5.c
@@ -810,6 +810,7 @@ sasl_digest_md5_challenge_sync (CamelSasl *sasl,
gchar *tokens;
struct addrinfo *ai, hints;
const gchar *service_name;
+ const gchar *password;
/* Need to wait for the server */
if (!token)
@@ -819,7 +820,10 @@ sasl_digest_md5_challenge_sync (CamelSasl *sasl,
service_name = camel_sasl_get_service_name (sasl);
url = camel_service_get_camel_url (service);
- g_return_val_if_fail (url->passwd != NULL, NULL);
+ g_return_val_if_fail (url->user != NULL, NULL);
+
+ password = camel_service_get_password (service);
+ g_return_val_if_fail (password != NULL, NULL);
switch (priv->state) {
case STATE_AUTH:
@@ -863,7 +867,7 @@ sasl_digest_md5_challenge_sync (CamelSasl *sasl,
priv->response = generate_response (
priv->challenge, ptr, service_name,
- url->user, url->passwd);
+ url->user, password);
if (ai)
camel_freeaddrinfo (ai);
ret = digest_response (priv->response);
@@ -906,7 +910,7 @@ sasl_digest_md5_challenge_sync (CamelSasl *sasl,
return NULL;
}
- compute_response (priv->response, url->passwd, FALSE, out);
+ compute_response (priv->response, password, FALSE, out);
if (memcmp (out, rspauth->value, 32) != 0) {
g_free (rspauth->name);
g_free (rspauth->value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]