sasl.h   sasl.h 
skipping to change at line 125 skipping to change at line 125
* *
* If the server forbids the use of "@" in user names for other * If the server forbids the use of "@" in user names for other
* purposes, this simplifies security validation. * purposes, this simplifies security validation.
*/ */
#ifndef SASL_H #ifndef SASL_H
#define SASL_H 1 #define SASL_H 1
#define SASL_VERSION_MAJOR 2 #define SASL_VERSION_MAJOR 2
#define SASL_VERSION_MINOR 1 #define SASL_VERSION_MINOR 1
#define SASL_VERSION_STEP 20 #define SASL_VERSION_STEP 21
/* A convenience macro: same as was defined in the OpenLDAP LDAPDB */
#define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
(SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP)
#include "prop.h" #include "prop.h"
/************* /*************
* Basic API * * Basic API *
*************/ *************/
/* SASL result codes: */ /* SASL result codes: */
#define SASL_CONTINUE 1 /* another step is needed in authentication */ #define SASL_CONTINUE 1 /* another step is needed in authentication */
#define SASL_OK 0 /* successful result */ #define SASL_OK 0 /* successful result */
 End of changes. 1 change blocks. 
1 lines changed or deleted 5 lines changed or added


 saslplug.h   saslplug.h 
skipping to change at line 211 skipping to change at line 211
int spare_int3; int spare_int3;
int spare_int4; int spare_int4;
/* set to 0 initially, this allows a plugin with extended parameters /* set to 0 initially, this allows a plugin with extended parameters
* to work with an older framework by updating version as parameters * to work with an older framework by updating version as parameters
* are added. * are added.
*/ */
int param_version; int param_version;
} sasl_out_params_t; } sasl_out_params_t;
/* Used by both client and server side plugins */
typedef enum {
SASL_INFO_LIST_START = 0,
SASL_INFO_LIST_MECH,
SASL_INFO_LIST_END
} sasl_info_callback_stage_t;
/****************************** /******************************
* Client Mechanism Functions * * Client Mechanism Functions *
******************************/ ******************************/
/* /*
* input parameters to client SASL plugin * input parameters to client SASL plugin
* *
* created / destroyed by the glue code * created / destroyed by the glue code
* *
*/ */
skipping to change at line 422 skipping to change at line 429
int max_version, int max_version,
int *out_version, int *out_version,
sasl_client_plug_t **pluglist, sasl_client_plug_t **pluglist,
int *plugcount); int *plugcount);
/* add a client plug-in /* add a client plug-in
*/ */
LIBSASL_API int sasl_client_add_plugin(const char *plugname, LIBSASL_API int sasl_client_add_plugin(const char *plugname,
sasl_client_plug_init_t *cplugfunc); sasl_client_plug_init_t *cplugfunc);
typedef struct client_sasl_mechanism
{
int version;
char *plugname;
const sasl_client_plug_t *plug;
} client_sasl_mechanism_t;
typedef void sasl_client_info_callback_t (client_sasl_mechanism_t *m,
sasl_info_callback_stage_t stage,
void *rock);
/* Dump information about available client plugins */
LIBSASL_API int sasl_client_plugin_info (char *mech_list,
sasl_client_info_callback_t *info_cb,
void *info_cb_rock);
/******************** /********************
* Server Functions * * Server Functions *
********************/ ********************/
/* log message formatting routine */ /* log message formatting routine */
typedef void sasl_logmsg_p(sasl_conn_t *conn, const char *fmt, ...); typedef void sasl_logmsg_p(sasl_conn_t *conn, const char *fmt, ...);
/* /*
* input parameters to server SASL plugin * input parameters to server SASL plugin
* *
skipping to change at line 742 skipping to change at line 766
int *out_version, int *out_version,
sasl_server_plug_t **pluglist, sasl_server_plug_t **pluglist,
int *plugcount); int *plugcount);
/* /*
* add a server plug-in * add a server plug-in
*/ */
LIBSASL_API int sasl_server_add_plugin(const char *plugname, LIBSASL_API int sasl_server_add_plugin(const char *plugname,
sasl_server_plug_init_t *splugfunc); sasl_server_plug_init_t *splugfunc);
typedef struct server_sasl_mechanism
{
int version;
int condition; /* set to SASL_NOUSER if no available users;
set to SASL_CONTINUE if delayed plugin loading */
char *plugname; /* for AUTHSOURCE tracking */
const sasl_server_plug_t *plug;
char *f; /* where should i load the mechanism from? */
} server_sasl_mechanism_t;
typedef void sasl_server_info_callback_t (server_sasl_mechanism_t *m,
sasl_info_callback_stage_t stage,
void *rock);
/* Dump information about available server plugins (separate functions shou
ld be
used for canon and auxprop plugins */
LIBSASL_API int sasl_server_plugin_info (char *mech_list,
sasl_server_info_callback_t *info_cb,
void *info_cb_rock);
/********************************************************* /*********************************************************
* user canonicalization plug-in -- added cjn 1999-09-29 * * user canonicalization plug-in -- added cjn 1999-09-29 *
*********************************************************/ *********************************************************/
typedef struct sasl_canonuser { typedef struct sasl_canonuser {
/* optional features of plugin (set to 0) */ /* optional features of plugin (set to 0) */
int features; int features;
/* spare integer (set to 0) */ /* spare integer (set to 0) */
int spare_int1; int spare_int1;
 End of changes. 3 change blocks. 
0 lines changed or deleted 45 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/