On Mon, Apr 04, 2005 at 10:01:48AM +0100, Philip Hazel wrote:
> That one I *have* lost. I recall seeing discussing going on, and I was
> waiting for some outcome, and probably overlooked it. Please send the
> patch again.
Here it is. Author is Jürgen Kreileder
--- src/auths/cyrus_sasl.c.orig 2005-03-16 19:58:56.000000000 +0100
+++ src/auths/cyrus_sasl.c 2005-03-16 20:06:18.000000000 +0100
@@ -67,6 +67,22 @@ auth_cyrus_sasl_options_block auth_cyrus
* Initialization entry point *
*************************************************/
+static int mysasl_config(void *context,
+ const char *plugin_name,
+ const char *option,
+ const char **result,
+ unsigned int *len)
+{
+ if (context && !strcmp(option, "mech_list")) {
+ *result = context;
+ if (len) {
+ *len = strlen(*result);
+ }
+ return SASL_OK;
+ }
+ return SASL_FAIL;
+}
+
/* Called for each instance, after its options have been read, to
enable consistency checks to be done, or anything else that needs
to be set up. */
@@ -76,7 +92,6 @@ auth_cyrus_sasl_init(auth_instance *ablo
{
auth_cyrus_sasl_options_block *ob =
(auth_cyrus_sasl_options_block *)(ablock->options_block);
-sasl_callback_t cbs[]={{SASL_CB_LIST_END, NULL, NULL}};
sasl_conn_t *conn;
uschar *list, *listptr, *buffer;
int rc, i;
@@ -90,7 +105,13 @@ if(ob->server_mech == NULL)
/* we're going to initialise the library to check that there is an
* authenticator of type whatever mechanism we're using
*/
-rc=sasl_server_init(cbs, "exim");
+{
+ sasl_callback_t cbs[]={
+ {SASL_CB_GETOPT, &mysasl_config, ob->server_mech },
+ {SASL_CB_LIST_END, NULL, NULL}
+ };
+ rc=sasl_server_init(cbs, "exim");
+}
if( rc != SASL_OK )
log_write(0, LOG_PANIC_DIE|LOG_CONFIG_FOR, "%s authenticator: "
"couldn't initialise Cyrus SASL library.", ablock->name);
--
-----------------------------------------------------------------------------
Marc Haber | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany | lose things." Winona Ryder | Fon: *49 621 72739834
Nordisch by Nature | How to make an American Quilt | Fax: *49 621 72739835
