diff options
| author | ume <ume@FreeBSD.org> | 2011-10-01 18:20:10 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2011-10-01 18:20:10 +0000 |
| commit | 68c6f15722f9509e1acf75c09261e89990c5465a (patch) | |
| tree | b5c85a216725657d9aec5ccbd9e8340d9a0b27ee /contrib/sendmail | |
| parent | 5d35bac957d516cad359f4476f18e99c5c6d3cd2 (diff) | |
| download | FreeBSD-src-68c6f15722f9509e1acf75c09261e89990c5465a.zip FreeBSD-src-68c6f15722f9509e1acf75c09261e89990c5465a.tar.gz | |
Shut up warnings with Cyrus SASL 2.1.25.
Spotted by: ache
Tested by: ache
Diffstat (limited to 'contrib/sendmail')
| -rw-r--r-- | contrib/sendmail/src/main.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/src/sendmail.h | 5 | ||||
| -rw-r--r-- | contrib/sendmail/src/usersmtp.c | 10 |
3 files changed, 12 insertions, 7 deletions
diff --git a/contrib/sendmail/src/main.c b/contrib/sendmail/src/main.c index 4d2318f..e14ffa0 100644 --- a/contrib/sendmail/src/main.c +++ b/contrib/sendmail/src/main.c @@ -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 */ diff --git a/contrib/sendmail/src/sendmail.h b/contrib/sendmail/src/sendmail.h index 39ba16c..ecb3fa3 100644 --- a/contrib/sendmail/src/sendmail.h +++ b/contrib/sendmail/src/sendmail.h @@ -133,10 +133,15 @@ SM_UNUSED(static char SmailId[]) = "@(#)$Id: sendmail.h,v 8.1089 2011/03/15 23:1 # 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 diff --git a/contrib/sendmail/src/usersmtp.c b/contrib/sendmail/src/usersmtp.c index 0de839e..c5da512 100644 --- a/contrib/sendmail/src/usersmtp.c +++ b/contrib/sendmail/src/usersmtp.c @@ -524,15 +524,15 @@ static int attemptauth __P((MAILER *, MCI *, ENVELOPE *, SASL_AI_T *)); 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 } }; |
