[Date Prev][Date Next] [Chronological] [Thread] [Top]

Re: commit: ldap/servers/slapd sasl.c

Hallvard B Furuseth wrote:

ando@OpenLDAP.org writes:

clarify auxprop_store member type


- slap_auxprop_store
+ slap_auxprop_store /* the declaration of this member changed
+ * in cyrus SASL from 2.1.15 to 2.1.16 */

Looks like the code needs an #ifdef for SASL < 2.1.16.

Exactly, but I didn't follow cyrus-sasl's evolution with auxprops enough to know how to deal with earlier versions. I noticed the problem with 2.1.15, where the field is declared as void (*spare_fptr1)(), which results in a warning; in 2.1.16 beta it's declared as

int (*auxprop_store)(void *glob_context,
                        sasl_server_params_t *sparams,
                        struct propctx *ctx,
                        const char *user, unsigned ulen);

note that the structure members have different
names in the two versions!

Personally, I can live with the warning until
both OL 2.2 and cyrus 2.1 stabilize :)

|   SysNet - via Dossi,8 27100 Pavia Tel: +390382573859 Fax:+390382476497    |