mutt stable branch with some hacks
An updated version of the previous patch. From Brendan.
+23
-27
-3
imap/auth_sasl.c
-3
imap/auth_sasl.c
+23
-17
mutt_sasl.c
+23
-17
mutt_sasl.c
···
34
34
35
35
static sasl_callback_t mutt_sasl_callbacks[5];
36
36
37
+
static int mutt_sasl_start (void);
38
+
37
39
/* callbacks */
38
40
static int mutt_sasl_cb_log (void* context, int priority, const char* message);
39
41
static int mutt_sasl_cb_authname (void* context, int id, const char** result,
···
57
59
sasl_callback_t* callback, callbacks[2];
58
60
int rc;
59
61
60
-
if (!sasl_init) {
61
-
/* set up default logging callback */
62
-
callback = callbacks;
62
+
if (sasl_init)
63
+
return SASL_OK;
63
64
64
-
callback->id = SASL_CB_LOG;
65
-
callback->proc = mutt_sasl_cb_log;
66
-
callback->context = NULL;
67
-
callback++;
65
+
/* set up default logging callback */
66
+
callback = callbacks;
68
67
69
-
callback->id = SASL_CB_LIST_END;
70
-
callback->proc = NULL;
71
-
callback->context = NULL;
68
+
callback->id = SASL_CB_LOG;
69
+
callback->proc = mutt_sasl_cb_log;
70
+
callback->context = NULL;
71
+
callback++;
72
72
73
-
rc = sasl_client_init (callbacks);
73
+
callback->id = SASL_CB_LIST_END;
74
+
callback->proc = NULL;
75
+
callback->context = NULL;
74
76
75
-
if (rc != SASL_OK)
76
-
{
77
-
dprint (1, (debugfile, "mutt_sasl_start: libsasl initialisation failed.\n"));
78
-
return SASL_FAIL;
79
-
}
77
+
rc = sasl_client_init (callbacks);
80
78
81
-
sasl_init = 1;
79
+
if (rc != SASL_OK)
80
+
{
81
+
dprint (1, (debugfile, "mutt_sasl_start: libsasl initialisation failed.\n"));
82
+
return SASL_FAIL;
82
83
}
84
+
85
+
sasl_init = 1;
83
86
84
87
return SASL_OK;
85
88
}
···
93
96
sasl_external_properties_t extprops;
94
97
const char* service;
95
98
int rc;
99
+
100
+
if (mutt_sasl_start () != SASL_OK)
101
+
return -1;
96
102
97
103
switch (conn->account.type)
98
104
{
-1
mutt_sasl.h
-1
mutt_sasl.h
-6
pop_auth.c
-6
pop_auth.c
···
45
45
unsigned int len, olen;
46
46
unsigned char client_start;
47
47
48
-
if (!pop_data->auth_list)
49
-
return POP_A_UNAVAIL;
50
-
51
-
if (mutt_sasl_start () != SASL_OK)
52
-
return POP_A_FAILURE;
53
-
54
48
if (mutt_sasl_client_new (pop_data->conn, &saslconn) < 0)
55
49
{
56
50
dprint (1, (debugfile, "pop_auth_sasl: Error allocating SASL connection.\n"));