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
Merge native DKIM support (from DEVEL_PDKIM)
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 77e5fa4acf9ceb3f24f05466ff88b7e538861a20..77d27ab53e7f1d6e830e0fb7d2b60f0c573bea39 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/exim.c,v 1.
58 2007/09/04 08:18:12 nm4
Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.
62 2009/06/10 07:34:04 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,8
+920,8
@@
fprintf(f, "Support for:");
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
#ifdef EXPERIMENTAL_BRIGHTMAIL
fprintf(f, " Experimental_Brightmail");
#endif
-#ifdef EXPERIMENTAL_D
OMAINKEYS
- fprintf(f, " Experimental_D
omainKeys
");
+#ifdef EXPERIMENTAL_D
CC
+ fprintf(f, " Experimental_D
CC
");
#endif
fprintf(f, "\n");
#endif
fprintf(f, "\n");
@@
-1253,7
+1256,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);
}