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 22b0a8c8c75f4f7b733c17b4543513fa61cee72c..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.60 2008/01/17 13:03:35 tom Exp $ */
+/* $Cambridge: exim/src/src/exim.c,v 1.62 2009/06/10 07:34:04 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -905,6 +905,9 @@ fprintf(f, "Support for:");
 #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
@@ -917,12 +920,6 @@ fprintf(f, "Support for:");
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   fprintf(f, " Experimental_Brightmail");
 #endif
-#ifdef EXPERIMENTAL_DOMAINKEYS
-  fprintf(f, " Experimental_DomainKeys");
-#endif
-#ifdef EXPERIMENTAL_DKIM
-  fprintf(f, " Experimental_DKIM");
-#endif
 #ifdef EXPERIMENTAL_DCC
   fprintf(f, " Experimental_DCC");
 #endif
@@ -1259,7 +1256,7 @@ exim_usage(uschar *progname)
 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);
   }