Add a bunch of expandables and some DKIM ACL red tape

[users/jgh/exim.git] / src / src / dkim.h

diff --git a/src/src/dkim.h b/src/src/dkim.h
index c9c602fa6c1e388a513cb49a27f66bc51f29f8ba..f683914d50ff1e618d36dade71e0883fde256704 100644 (file)
--- a/src/src/dkim.h
+++ b/src/src/dkim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/dkim.h,v 1.1.2.4 2009/05/20 14:30:14 tom Exp $ */
+/* $Cambridge: exim/src/src/dkim.h,v 1.1.2.5 2009/06/08 21:06:31 tom Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -7,16 +7,27 @@
 /* Copyright (c) University of Cambridge 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
-uschar *dkim_exim_sign(int,
-                       uschar *,
-                       uschar *,
-                       uschar *,
-                       uschar *,
-                       uschar *);
+uschar *dkim_exim_sign(int,uschar *,uschar *,uschar *,uschar *,uschar *);
+void    dkim_exim_verify_init(void);
+void    dkim_exim_verify_feed(uschar *, int);
+void    dkim_exim_verify_finish(void);
+void    dkim_exim_acl_setup(uschar *);
+uschar *dkim_exim_expand_query(int);
+uschar *dkim_exim_expand_defaults(int);
 
-void dkim_exim_verify_init(void);
-void dkim_exim_verify_feed(uschar *, int);
-void dkim_exim_verify_finish(void);
-void dkim_exim_verify_result(uschar *,
-                             uschar **,
-                             uschar **);
+#define DKIM_ALGO               1
+#define DKIM_BODYLENGTH         2
+#define DKIM_CANON_BODY         3
+#define DKIM_CANON_HEADERS      4
+#define DKIM_COPIEDHEADERS      5
+#define DKIM_CREATED            6
+#define DKIM_EXPIRES            7
+#define DKIM_HEADERNAMES        8
+#define DKIM_IDENTITY           9
+#define DKIM_KEY_GRANULARITY   10
+#define DKIM_KEY_SRVTYPE       11
+#define DKIM_KEY_NOTES         12
+#define DKIM_KEY_TESTING       13
+#define DKIM_NOSUBDOMAINS      14
+#define DKIM_VERIFY_STATUS     15
+#define DKIM_VERIFY_REASON     16