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
Bugzilla #643
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 2da43ff8855378068c83df84166265956c7bfbb5..53de800151f4bc922fde509674e8df21f3dd56b2 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.
59 2007/09/28 12:21:57
tom Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.
64 2009/10/16 08:51:34
tom Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-905,6
+905,9
@@
fprintf(f, "Support for:");
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
#ifdef WITH_CONTENT_SCAN
fprintf(f, " Content_Scanning");
#endif
+#ifndef DISABLE_DKIM
+ fprintf(f, " DKIM");
+#endif
#ifdef WITH_OLD_DEMIME
fprintf(f, " Old_Demime");
#endif
#ifdef WITH_OLD_DEMIME
fprintf(f, " Old_Demime");
#endif
@@
-917,11
+920,8
@@
fprintf(f, "Support for:");
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
-#ifdef EXPERIMENTAL_DOMAINKEYS
- fprintf(f, " Experimental_DomainKeys");
-#endif
-#ifdef EXPERIMENTAL_DKIM
- fprintf(f, " Experimental_DKIM");
+#ifdef EXPERIMENTAL_DCC
+ fprintf(f, " Experimental_DCC");
#endif
fprintf(f, "\n");
#endif
fprintf(f, "\n");
@@
-1055,6
+1055,14
@@
if (fixed_never_users[0] > 0)
}
fprintf(f, "Size of off_t: %d\n", sizeof(off_t));
}
fprintf(f, "Size of off_t: %d\n", sizeof(off_t));
+
+/* This runtime check is to help diagnose library linkage mismatches which
+result in segfaults and the like; as such, it's left until the end,
+just in case. There will still be a "Configuration file is" line still to
+come. */
+#ifdef SUPPORT_TLS
+tls_version_report(f);
+#endif
}
}
@@
-1256,7
+1264,7
@@
exim_usage(uschar *progname)
if (Ustrcmp(progname, US"-mailq") == 0)
{
fprintf(stderr,
if (Ustrcmp(progname, US"-mailq") == 0)
{
fprintf(stderr,
- "mailq - list the contents of the mail queue\n\n"
,
+ "mailq - list the contents of the mail queue\n\n"
"For a list of options, see the Exim documentation.\n");
exit(EXIT_FAILURE);
}
"For a list of options, see the Exim documentation.\n");
exit(EXIT_FAILURE);
}
@@
-3931,7
+3939,8
@@
if (list_options)
if (i < argc - 1 &&
(Ustrcmp(argv[i], "router") == 0 ||
Ustrcmp(argv[i], "transport") == 0 ||
if (i < argc - 1 &&
(Ustrcmp(argv[i], "router") == 0 ||
Ustrcmp(argv[i], "transport") == 0 ||
- Ustrcmp(argv[i], "authenticator") == 0))
+ Ustrcmp(argv[i], "authenticator") == 0 ||
+ Ustrcmp(argv[i], "macro") == 0))
{
readconf_print(argv[i+1], argv[i]);
i++;
{
readconf_print(argv[i+1], argv[i]);
i++;