Attachment #6761 for bug #30270

View | Details | Raw Unified | Return to bug 30270
Collapse All | Expand All

Lines 224-230 XSASL_CLIENT_IMPL xsasl_cyrus_client_init(const char unused_client_type, Link Here

(-)a/src/xsasl/xsasl_cyrus_client.c (-1 lines)
224	*/	224	*/
225	static sasl_callback_t callbacks[] = {	225	static sasl_callback_t callbacks[] = {
226	{SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, 0},	226	{SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, 0},
227	{SASL_CB_GETPATH, &xsasl_getconfpath, 0},
228	#ifdef SASL_CB_GETCONFPATH	227	#ifdef SASL_CB_GETCONFPATH
229	{SASL_CB_GETCONFPATH, &xsasl_getconfpath, 0},	228	{SASL_CB_GETCONFPATH, &xsasl_getconfpath, 0},
230	#endif	229	#endif

Lines 16-28 Link Here

(-)a/src/xsasl/xsasl_cyrus_common.h (+4 lines)
16	*/	16	*/
17	#if defined(USE_SASL_AUTH) && defined(USE_CYRUS_SASL)	17	#if defined(USE_SASL_AUTH) && defined(USE_CYRUS_SASL)
18		18
		19	#include <sasl.h>
		20
19	#define NO_SASL_LANGLIST ((const char *) 0)	21	#define NO_SASL_LANGLIST ((const char *) 0)
20	#define NO_SASL_OUTLANG ((const char **) 0)	22	#define NO_SASL_OUTLANG ((const char **) 0)
21	#define xsasl_cyrus_strerror(status) \	23	#define xsasl_cyrus_strerror(status) \
22	sasl_errstring((status), NO_SASL_LANGLIST, NO_SASL_OUTLANG)	24	sasl_errstring((status), NO_SASL_LANGLIST, NO_SASL_OUTLANG)
23	extern int xsasl_cyrus_log(void , int, const char );	25	extern int xsasl_cyrus_log(void , int, const char );
24	extern int xsasl_cyrus_security_parse_opts(const char *);	26	extern int xsasl_cyrus_security_parse_opts(const char *);
		27	#ifdef SASL_CB_GETCONFPATH
25	extern int xsasl_getconfpath(void , char *);	28	extern int xsasl_getconfpath(void , char *);
		29	#endif
26		30
27	#endif	31	#endif
28		32

Lines 102-107 int xsasl_cyrus_log(void *unused_context, int priority, Link Here

(-)a/src/xsasl/xsasl_cyrus_log.c (+2 lines)
102	return (SASL_OK);	102	return (SASL_OK);
103	}	103	}
104		104
		105	#ifdef SASL_CB_GETCONFPATH
105	int xsasl_getconfpath(void unused_context, char *path)	106	int xsasl_getconfpath(void unused_context, char *path)
106	{	107	{
107	#if SASL_VERSION_MAJOR >= 2	108	#if SASL_VERSION_MAJOR >= 2
Lines 111-115 int xsasl_getconfpath(void unused_context, char *path) Link Here
111	#endif	112	#endif
112	return (SASL_OK);	113	return (SASL_OK);
113	}	114	}
		115	#ifdef SASL_CB_GETCONFPATH
114		116
115	#endif	117	#endif

Lines 171-177 static const char xsasl_cyrus_server_get_username(XSASL_SERVER ); Link Here

(-)a/src/xsasl/xsasl_cyrus_server.c (-1 lines)
171		171
172	static sasl_callback_t callbacks[] = {	172	static sasl_callback_t callbacks[] = {
173	{SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, NO_CALLBACK_CONTEXT},	173	{SASL_CB_LOG, (XSASL_CYRUS_CB) &xsasl_cyrus_log, NO_CALLBACK_CONTEXT},
174	{SASL_CB_GETPATH, &xsasl_getconfpath, 0},
175	#ifdef SASL_CB_GETCONFPATH	174	#ifdef SASL_CB_GETCONFPATH
176	{SASL_CB_GETCONFPATH, &xsasl_getconfpath, 0},	175	{SASL_CB_GETCONFPATH, &xsasl_getconfpath, 0},
177	#endif	176	#endif

Return to bug 30270