prop.h   prop.h 
skipping to change at line 37 skipping to change at line 37
* are compiled with the LIBSASL_EXPORTS symbol defined on the command * are compiled with the LIBSASL_EXPORTS symbol defined on the command
* line. this symbol should not be defined on any project that uses * line. this symbol should not be defined on any project that uses
* this DLL. This way any other project whose source files include * this DLL. This way any other project whose source files include
* this file see LIBSASL_API functions as being imported from a DLL, * this file see LIBSASL_API functions as being imported from a DLL,
* wheras this DLL sees symbols defined with this macro as being * wheras this DLL sees symbols defined with this macro as being
* exported. */ * exported. */
/* Under Unix, life is simpler: we just need to mark library functions /* Under Unix, life is simpler: we just need to mark library functions
* as extern. (Technically, we don't even have to do that.) */ * as extern. (Technically, we don't even have to do that.) */
#ifdef WIN32 #ifdef WIN32
# ifdef LIBSASL_EXPORTS # ifdef LIBSASL_EXPORTS
# define LIBSASL_API __declspec(dllexport) # define LIBSASL_API extern __declspec(dllexport)
# else /* LIBSASL_EXPORTS */ # else /* LIBSASL_EXPORTS */
# define LIBSASL_API __declspec(dllimport) # define LIBSASL_API extern __declspec(dllimport)
# endif /* LIBSASL_EXPORTS */ # endif /* LIBSASL_EXPORTS */
#else /* WIN32 */ #else /* WIN32 */
# define LIBSASL_API extern # define LIBSASL_API extern
#endif /* WIN32 */ #endif /* WIN32 */
/* Same as above, but used during a variable declaration. Only Unix definit /* Same as above, but used during a variable declaration. */
ion
* is different, as we can't assign an initial value to an extern variable
*/
#ifdef WIN32 #ifdef WIN32
# ifdef LIBSASL_EXPORTS # ifdef LIBSASL_EXPORTS
# define LIBSASL_VAR __declspec(dllexport) # define LIBSASL_VAR extern __declspec(dllexport)
# else /* LIBSASL_EXPORTS */ # else /* LIBSASL_EXPORTS */
# define LIBSASL_VAR __declspec(dllimport) # define LIBSASL_VAR extern __declspec(dllimport)
# endif /* LIBSASL_EXPORTS */ # endif /* LIBSASL_EXPORTS */
#else /* WIN32 */ #else /* WIN32 */
# define LIBSASL_VAR # define LIBSASL_VAR extern
#endif /* WIN32 */ #endif /* WIN32 */
/* the resulting structure for property values /* the resulting structure for property values
*/ */
struct propval { struct propval {
const char *name; /* name of property; NULL = end of list */ const char *name; /* name of property; NULL = end of list */
/* same pointer used in request will be used here */ /* same pointer used in request will be used here */
const char **values; /* list of strings, values == NULL if property not const char **values; /* list of strings, values == NULL if property not
* found, *values == NULL if property found with * found, *values == NULL if property found with
* no values */ * no values */
 End of changes. 6 change blocks. 
9 lines changed or deleted 6 lines changed or added


 sasl.h   sasl.h 
skipping to change at line 127 skipping to change at line 127
* 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
/* Keep in sync with win32/common.mak */ /* Keep in sync with win32/common.mak */
#define SASL_VERSION_MAJOR 2 #define SASL_VERSION_MAJOR 2
#define SASL_VERSION_MINOR 1 #define SASL_VERSION_MINOR 1
#define SASL_VERSION_STEP 25 #define SASL_VERSION_STEP 26
/* A convenience macro: same as was defined in the OpenLDAP LDAPDB */ /* A convenience macro: same as was defined in the OpenLDAP LDAPDB */
#define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\ #define SASL_VERSION_FULL ((SASL_VERSION_MAJOR << 16) |\
(SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP) (SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP)
#include "prop.h" #include "prop.h"
/************* /*************
* Basic API * * Basic API *
*************/ *************/
skipping to change at line 227 skipping to change at line 227
/**************************** /****************************
* Configure Basic Services * * Configure Basic Services *
****************************/ ****************************/
/* the following functions are used to adjust how allocation and mutexes wo rk /* the following functions are used to adjust how allocation and mutexes wo rk
* they must be called before all other SASL functions: * they must be called before all other SASL functions:
*/ */
/* memory allocation functions which may optionally be replaced: /* memory allocation functions which may optionally be replaced:
*/ */
typedef void *sasl_malloc_t(unsigned long); typedef void *sasl_malloc_t(size_t);
typedef void *sasl_calloc_t(unsigned long, unsigned long); typedef void *sasl_calloc_t(size_t, size_t);
typedef void *sasl_realloc_t(void *, unsigned long); typedef void *sasl_realloc_t(void *, size_t);
typedef void sasl_free_t(void *); typedef void sasl_free_t(void *);
LIBSASL_API void sasl_set_alloc(sasl_malloc_t *, LIBSASL_API void sasl_set_alloc(sasl_malloc_t *,
sasl_calloc_t *, sasl_calloc_t *,
sasl_realloc_t *, sasl_realloc_t *,
sasl_free_t *); sasl_free_t *);
/* mutex functions which may optionally be replaced: /* mutex functions which may optionally be replaced:
* sasl_mutex_alloc allocates a mutex structure * sasl_mutex_alloc allocates a mutex structure
* sasl_mutex_lock blocks until mutex locked * sasl_mutex_lock blocks until mutex locked
skipping to change at line 634 skipping to change at line 634
* SASL_OK on success * SASL_OK on success
* SASL_BADPROT username contains invalid character * SASL_BADPROT username contains invalid character
*/ */
/* User Canonicalization Function Flags */ /* User Canonicalization Function Flags */
#define SASL_CU_NONE 0x00 /* Not a valid flag to pass */ #define SASL_CU_NONE 0x00 /* Not a valid flag to pass */
/* One of the following two is required */ /* One of the following two is required */
#define SASL_CU_AUTHID 0x01 #define SASL_CU_AUTHID 0x01
#define SASL_CU_AUTHZID 0x02 #define SASL_CU_AUTHZID 0x02
/* Combine the following with SASL_CU_AUTHID, if you don't want /* Combine the following with SASL_CU_AUTHID, if you don't want
to fail if auxprop returned SASL_NOUSER */ to fail if auxprop returned SASL_NOUSER/SASL_NOMECH.
This flag has no effect on SASL_CU_AUTHZID. */
#define SASL_CU_EXTERNALLY_VERIFIED 0x04 #define SASL_CU_EXTERNALLY_VERIFIED 0x04
#define SASL_CU_OVERRIDE 0x08 /* mapped to SASL_AUXPROP_OVERRI DE */ #define SASL_CU_OVERRIDE 0x08 /* mapped to SASL_AUXPROP_OVERRI DE */
/* The following CU flags are passed "as is" down to auxprop lookup */ /* The following CU flags are passed "as is" down to auxprop lookup */
#define SASL_CU_ASIS_MASK 0xFFF0 #define SASL_CU_ASIS_MASK 0xFFF0
/* NOTE: Keep in sync with SASL_AUXPROP_<XXX> flags */ /* NOTE: Keep in sync with SASL_AUXPROP_<XXX> flags */
#define SASL_CU_VERIFY_AGAINST_HASH 0x10 #define SASL_CU_VERIFY_AGAINST_HASH 0x10
typedef int sasl_canon_user_t(sasl_conn_t *conn, typedef int sasl_canon_user_t(sasl_conn_t *conn,
 End of changes. 4 change blocks. 
5 lines changed or deleted 7 lines changed or added


 saslutil.h   saslutil.h 
skipping to change at line 85 skipping to change at line 85
/* erase a security sensitive buffer or password. /* erase a security sensitive buffer or password.
* Implementation may use recovery-resistant erase logic. * Implementation may use recovery-resistant erase logic.
*/ */
LIBSASL_API void sasl_erasebuffer(char *pass, unsigned len); LIBSASL_API void sasl_erasebuffer(char *pass, unsigned len);
/* Lowercase string in place */ /* Lowercase string in place */
LIBSASL_API char *sasl_strlower (char *val); LIBSASL_API char *sasl_strlower (char *val);
LIBSASL_API int sasl_config_init(const char *filename); LIBSASL_API int sasl_config_init(const char *filename);
LIBSASL_API void sasl_config_done(void);
#ifdef WIN32 #ifdef WIN32
/* Just in case a different DLL defines this as well */ /* Just in case a different DLL defines this as well */
#if defined(NEED_GETOPT) #if defined(NEED_GETOPT)
LIBSASL_API int getopt(int argc, char **argv, char *optstring); LIBSASL_API int getopt(int argc, char **argv, char *optstring);
#endif #endif
LIBSASL_API char * getpass(const char *prompt); LIBSASL_API char * getpass(const char *prompt);
#endif /* WIN32 */ #endif /* WIN32 */
#ifdef __cplusplus #ifdef __cplusplus
} }
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 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/