Author: ume
Date: Sat Oct 1 18:20:10 2011
New Revision: 225906
URL: http://svn.freebsd.org/changeset/base/225906
Log:
Shut up warnings with Cyrus SASL 2.1.25.
Spotted by: ache
Tested by: ache
Modified:
head/contrib/sendmail/src/main.c
head/contrib/sendmail/src/sendmail.h
head/contrib/sendmail/src/usersmtp.c
Modified: head/contrib/sendmail/src/main.c
==============================================================================
--- head/contrib/sendmail/src/main.c Sat Oct 1 16:08:03 2011
(r225905)
+++ head/contrib/sendmail/src/main.c Sat Oct 1 18:20:10 2011
(r225906)
@@ -109,8 +109,8 @@ GIDSET_T InitialGidSet[NGROUPS_MAX];
#if SASL
static sasl_callback_t srvcallbacks[] =
{
- { SASL_CB_VERIFYFILE, &safesaslfile, NULL },
- { SASL_CB_PROXY_POLICY, &proxy_policy, NULL },
+ { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile,
NULL },
+ { SASL_CB_PROXY_POLICY, (sasl_callback_ft)&proxy_policy,
NULL },
{ SASL_CB_LIST_END, NULL, NULL }
};
#endif /* SASL */
Modified: head/contrib/sendmail/src/sendmail.h
==============================================================================
--- head/contrib/sendmail/src/sendmail.h Sat Oct 1 16:08:03 2011
(r225905)
+++ head/contrib/sendmail/src/sendmail.h Sat Oct 1 18:20:10 2011
(r225906)
@@ -133,10 +133,15 @@ SM_UNUSED(static char SmailId[]) = "@(#)
# if SASL == 2 || SASL >= 20000
# include <sasl/sasl.h>
+# include <sasl/saslplug.h>
# include <sasl/saslutil.h>
+# if SASL_VERSION_FULL < 0x020119
+typedef int (*sasl_callback_ft)(void);
+# endif
# else /* SASL == 2 || SASL >= 20000 */
# include <sasl.h>
# include <saslutil.h>
+typedef int (*sasl_callback_ft)(void);
# endif /* SASL == 2 || SASL >= 20000 */
# if defined(SASL_VERSION_MAJOR) && defined(SASL_VERSION_MINOR) &&
defined(SASL_VERSION_STEP)
# define SASL_VERSION (SASL_VERSION_MAJOR * 10000) + (SASL_VERSION_MINOR *
100) + SASL_VERSION_STEP
Modified: head/contrib/sendmail/src/usersmtp.c
==============================================================================
--- head/contrib/sendmail/src/usersmtp.c Sat Oct 1 16:08:03 2011
(r225905)
+++ head/contrib/sendmail/src/usersmtp.c Sat Oct 1 18:20:10 2011
(r225906)
@@ -524,15 +524,15 @@ static int attemptauth __P((MAILER *, MC
static sasl_callback_t callbacks[] =
{
- { SASL_CB_GETREALM, &saslgetrealm, NULL },
+ { SASL_CB_GETREALM, (sasl_callback_ft)&saslgetrealm,
NULL },
#define CB_GETREALM_IDX 0
- { SASL_CB_PASS, &getsecret, NULL },
+ { SASL_CB_PASS, (sasl_callback_ft)&getsecret, NULL
},
#define CB_PASS_IDX 1
- { SASL_CB_USER, &getsimple, NULL },
+ { SASL_CB_USER, (sasl_callback_ft)&getsimple, NULL
},
#define CB_USER_IDX 2
- { SASL_CB_AUTHNAME, &getsimple, NULL },
+ { SASL_CB_AUTHNAME, (sasl_callback_ft)&getsimple, NULL
},
#define CB_AUTHNAME_IDX 3
- { SASL_CB_VERIFYFILE, &safesaslfile, NULL },
+ { SASL_CB_VERIFYFILE, (sasl_callback_ft)&safesaslfile,
NULL },
#define CB_SAFESASL_IDX 4
{ SASL_CB_LIST_END, NULL, NULL }
};
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
