upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-04 14:26:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shut up warnings with Cyrus SASL 2.1.25.

Browse source 
Spotted by:	ache
Tested by:	ache
This commit is contained in:
Hajimu UMEMOTO 2011-10-01 18:20:10 +00:00
parent 1866626239
commit 35954bbaba
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/sendmail/src/main.c
View file

@ -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 */

5
contrib/sendmail/src/sendmail.h
View file

@ -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

10
contrib/sendmail/src/usersmtp.c
View file

@ -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 }
};