git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implemented gsasl driver for authentication.
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index a0b3e78b463e6e547503793598839d6c8b37f33d..b4ea01dcd35fa64cd6adfb4a8ddabc9848bc12e6 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-725,6
+725,8
@@
Returns: nothing
static void
show_whats_supported(FILE *f)
{
static void
show_whats_supported(FILE *f)
{
+ auth_info *authi;
+
#ifdef DB_VERSION_STRING
fprintf(f, "Berkeley DB: %s\n", DB_VERSION_STRING);
#elif defined(BTREEVERSION) && defined(HASHVERSION)
#ifdef DB_VERSION_STRING
fprintf(f, "Berkeley DB: %s\n", DB_VERSION_STRING);
#elif defined(BTREEVERSION) && defined(HASHVERSION)
@@
-867,6
+869,9
@@
fprintf(f, "Authenticators:");
#ifdef AUTH_DOVECOT
fprintf(f, " dovecot");
#endif
#ifdef AUTH_DOVECOT
fprintf(f, " dovecot");
#endif
+#ifdef AUTH_GSASL
+ fprintf(f, " gsasl");
+#endif
#ifdef AUTH_PLAINTEXT
fprintf(f, " plaintext");
#endif
#ifdef AUTH_PLAINTEXT
fprintf(f, " plaintext");
#endif
@@
-962,9
+967,11
@@
DEBUG(D_any) do {
tls_version_report(f);
#endif
tls_version_report(f);
#endif
-#ifdef AUTH_CYRUS_SASL
- auth_cyrus_sasl_version_report(f);
-#endif
+ for (authi = auths_available; *authi->driver_name != '\0'; ++authi) {
+ if (authi->version_report) {
+ (*authi->version_report)(f);
+ }
+ }
fprintf(f, "Library version: PCRE: Compile: %d.%d%s\n"
" Runtime: %s\n",
fprintf(f, "Library version: PCRE: Compile: %d.%d%s\n"
" Runtime: %s\n",
@@
-973,7
+980,9
@@
DEBUG(D_any) do {
* unless its an ancient version of PCRE in which case it
* is not defined */
#ifdef PCRE_PRERELEASE
* unless its an ancient version of PCRE in which case it
* is not defined */
#ifdef PCRE_PRERELEASE
- PCRE_PRERELEASE "",
+# define STRINGIFY(x) #x
+ STRINGIFY(PCRE_PRERELEASE) "",
+# undef STRINGIFY
#else
"",
#endif
#else
"",
#endif
@@
-1078,9
+1087,9
@@
set_readline(char * (**fn_readline_ptr)(const char *),
void (**fn_addhist_ptr)(const char *))
{
void *dlhandle;
void (**fn_addhist_ptr)(const char *))
{
void *dlhandle;
-void *dlhandle_curses = dlopen("libcurses.
so"
, RTLD_GLOBAL|RTLD_LAZY);
+void *dlhandle_curses = dlopen("libcurses.
" DYNLIB_FN_EXT
, RTLD_GLOBAL|RTLD_LAZY);
-dlhandle = dlopen("libreadline.
so"
, RTLD_GLOBAL|RTLD_NOW);
+dlhandle = dlopen("libreadline.
" DYNLIB_FN_EXT
, RTLD_GLOBAL|RTLD_NOW);
if (dlhandle_curses != NULL) dlclose(dlhandle_curses);
if (dlhandle != NULL)
if (dlhandle_curses != NULL) dlclose(dlhandle_curses);
if (dlhandle != NULL)