1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
|
From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 18 Jun 2013 15:27:55 +0000
Subject: smtp-auth-plain: Handle multiline SMTP greetings
Fixes: https://bugzilla.gnome.org/702263
---
diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c
index bb783bd..77324cf 100644
--- a/src/goabackend/goasmtpauthplain.c
+++ b/src/goabackend/goasmtpauthplain.c
@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error)
/* ---------------------------------------------------------------------------------------------------- */
+static gboolean
+smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error)
+{
+ gboolean ret;
+ gchar *response;
+
+ response = NULL;
+ ret = FALSE;
+
+ greeting_again:
+ response = g_data_input_stream_read_line (input, NULL, cancellable, error);
+ if (response == NULL)
+ goto out;
+ g_debug ("< %s", response);
+ if (smtp_auth_plain_check_421 (response, error))
+ goto out;
+ if (smtp_auth_plain_check_not_220 (response, error))
+ goto out;
+
+ if (response[3] == '-')
+ {
+ g_clear_pointer (&response, g_free);
+ goto greeting_again;
+ }
+
+ ret = TRUE;
+
+ out:
+ g_free (response);
+ return ret;
+}
+
+/* ---------------------------------------------------------------------------------------------------- */
+
static gchar *
smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth,
GError **error)
@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth,
if (!auth->greeting_absent)
{
- response = g_data_input_stream_read_line (input, NULL, cancellable, error);
- if (response == NULL)
- goto out;
- g_debug ("< %s", response);
- if (smtp_auth_plain_check_421 (response, error))
+ if (!smtp_auth_plain_check_greeting (input, cancellable, error))
goto out;
- if (smtp_auth_plain_check_not_220 (response, error))
- goto out;
- g_clear_pointer (&response, g_free);
}
/* Send EHLO */
@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth,
/* Check the greeting */
- response = g_data_input_stream_read_line (input, NULL, cancellable, error);
- if (response == NULL)
- goto out;
- g_debug ("< %s", response);
- if (smtp_auth_plain_check_421 (response, error))
+ if (!smtp_auth_plain_check_greeting (input, cancellable, error))
goto out;
- if (smtp_auth_plain_check_not_220 (response, error))
- goto out;
- g_clear_pointer (&response, g_free);
/* Send EHLO */
--
cgit v0.9.2
|
