Cyrus SASL 2.1.21 released: addendum

[Steven Simon]

Hello

This version does not build with gcc 4.0 due to some new strictness.

The problem is that the global callback type in lib/client.c is  
declared static but is referred to externally by lib/saslint.h.

I was able to build with the workaround below. It's one possible  
resolution.

Steve



diff -ruw cyrus-sasl-2.1.21/lib/client.c cyrus-sasl-2.1.21-test/lib/ 
client.c
--- cyrus-sasl-2.1.21/lib/client.c      2004-11-17 06:19:30.000000000  
-0800
+++ cyrus-sasl-2.1.21-test/lib/client.c 2005-05-16 15:00:50.000000000  
-0700
@@ -61,7 +61,7 @@
static cmech_list_t *cmechlist; /* global var which holds the list */
-static sasl_global_callbacks_t global_callbacks;
+sasl_global_callbacks_t global_callbacks_client;
static int _sasl_client_active = 0;
@@ -70,7 +70,7 @@
    cmechlist->mutex = sasl_MUTEX_ALLOC();
    if(!cmechlist->mutex) return SASL_FAIL;

-  cmechlist->utils=_sasl_alloc_utils(NULL, &global_callbacks);
+  cmechlist->utils=_sasl_alloc_utils(NULL, &global_callbacks_client);
    if (cmechlist->utils==NULL)
      return SASL_NOMEM;
@@ -211,8 +211,8 @@
        return SASL_OK;
    }
-  global_callbacks.callbacks = callbacks;
-  global_callbacks.appname = NULL;
+  global_callbacks_client.callbacks = callbacks;
+  global_callbacks_client.appname = NULL;
    cmechlist=sasl_ALLOC(sizeof(cmech_list_t));
    if (cmechlist==NULL) return SASL_NOMEM;
@@ -229,7 +229,7 @@
    sasl_client_add_plugin("EXTERNAL", &external_client_plug_init);
-  ret = _sasl_common_init(&global_callbacks);
+  ret = _sasl_common_init(&global_callbacks_client);
    if (ret == SASL_OK)
        ret = _sasl_load_plugins(ep_list,
@@ -333,10 +333,10 @@
    result = _sasl_conn_init(*pconn, service, flags, SASL_CONN_CLIENT,
                            &client_idle, serverFQDN,
                            iplocalport, ipremoteport,
-                          prompt_supp, &global_callbacks);
+                          prompt_supp, &global_callbacks_client);
    if (result != SASL_OK) RETURN(*pconn, result);

-  utils=_sasl_alloc_utils(*pconn, &global_callbacks);
+  utils=_sasl_alloc_utils(*pconn, &global_callbacks_client);
    if (utils==NULL)
        MEMERROR(*pconn);



On May 16, 2005, at 2:32 PM, Derrick J Brashear wrote:

> On Mon, 16 May 2005, Derrick J Brashear wrote:
>
>
>> I'd like to announce the beta release of Cyrus SASL 2.1.21 on
>> ftp.andrew.cmu.edu. This version includes bug fixes most notably  
>> to the build
>>
>
> Correction, this is a real release. Apologies for the confusion.
>
>
>> Download at:
>> ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.21.tar.gz>
>