| sasl.h | | sasl.h | |
|---|
| | | | |
| skipping to change at line 92 | | skipping to change at line 92 | |
|---|
| * 7. call sasl_dispose(), may return to step 2 | | * 7. call sasl_dispose(), may return to step 2 | |
| * 8. call sasl_done() when program terminates | | * 8. call sasl_done() when program terminates | |
| * | | * | |
| */ | | */ | |
| | | | |
| #ifndef SASL_H | | #ifndef SASL_H | |
| #define SASL_H 1 | | #define SASL_H 1 | |
| | | | |
| #define SASL_VERSION_MAJOR 1 | | #define SASL_VERSION_MAJOR 1 | |
| #define SASL_VERSION_MINOR 5 | | #define SASL_VERSION_MINOR 5 | |
|
| #define SASL_VERSION_STEP 15 | | #define SASL_VERSION_STEP 16 | |
| | | | |
| /* The following ifdef block is the standard way of creating macros | | /* The following ifdef block is the standard way of creating macros | |
| * which make exporting from a DLL simpler. All files within this DLL | | * which make exporting from a DLL simpler. All files within this DLL | |
| * 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 | |
| | | | |
| skipping to change at line 391 | | skipping to change at line 391 | |
|---|
| | | | |
| #define SASL_CB_GETPATH (3) | | #define SASL_CB_GETPATH (3) | |
| | | | |
| /* verify file callback -- this allows applications to check if they | | /* verify file callback -- this allows applications to check if they | |
| * want SASL to use files, file by file. This is intended to allow | | * want SASL to use files, file by file. This is intended to allow | |
| * applications to sanity check the environment to make sure plugins | | * applications to sanity check the environment to make sure plugins | |
| * or the configuration file can't be written to, etc. | | * or the configuration file can't be written to, etc. | |
| * inputs: | | * inputs: | |
| * context -- verifypath context from the callback record | | * context -- verifypath context from the callback record | |
| * file -- full path to file to verify | | * file -- full path to file to verify | |
|
| | | * type -- type of file to verify | |
| | | | |
| * returns: | | * returns: | |
| * SASL_OK -- no error (file can safely be used) | | * SASL_OK -- no error (file can safely be used) | |
| * SASL_CONTINUE -- continue WITHOUT using this file | | * SASL_CONTINUE -- continue WITHOUT using this file | |
| * SASL_FAIL -- error | | * SASL_FAIL -- error | |
| */ | | */ | |
| typedef int sasl_verifyfile_t(void * context, | | typedef int sasl_verifyfile_t(void * context, | |
|
| const char * file); | | const char * file, const int type); | |
| | | | |
| #define SASL_CB_VERIFYFILE (4) | | #define SASL_CB_VERIFYFILE (4) | |
| | | | |
|
| | | /* these are the types of files libsasl will ask about */ | |
| | | #define SASL_VRFY_PLUGIN (1) | |
| | | #define SASL_VRFY_CONF (2) | |
| | | #define SASL_VRFY_PASSWD (3) | |
| | | #define SASL_VRFY_OTHER (4) | |
| | | | |
| /* client/user interaction callbacks: | | /* client/user interaction callbacks: | |
| */ | | */ | |
| /* Simple prompt -- result must persist until next call to getsimple or | | /* Simple prompt -- result must persist until next call to getsimple or | |
| * until connection context is disposed | | * until connection context is disposed | |
| * inputs: | | * inputs: | |
| * context -- context from callback structure | | * context -- context from callback structure | |
| * id -- callback id | | * id -- callback id | |
| * outputs: | | * outputs: | |
| * result -- set to NUL terminated string | | * result -- set to NUL terminated string | |
| * NULL = user cancel | | * NULL = user cancel | |
| | | | |
| End of changes. 4 change blocks. |
|---|
| 2 lines changed or deleted | | 9 lines changed or added | |
|---|
|