constify

diff --git a/src/src/dkim.c b/src/src/dkim.c
index dd999ff5b6a95a15f1b0ed47908629a1b47ba6dc..8bb2efbf059a29c56b0a8878d86c0338e7765d53 100644 (file)
--- a/src/src/dkim.c
+++ b/src/src/dkim.c
@@ -41,7 +41,7 @@ static const uschar * dkim_collect_error = NULL;
 */
 
 uschar *
-dkim_exim_query_dns_txt(uschar * name)
+dkim_exim_query_dns_txt(const uschar * name)
 {
 /*XXX need to always alloc the dnsa, from tainted mem.
 Then, we hope, the answers will be tainted */

diff --git a/src/src/functions.h b/src/src/functions.h
index 0602789597788209395d5d53a7b548429ce6d88b..de03bb8d01d2049a858492cafd8b21f4e76d2852 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -186,7 +186,7 @@ extern void    delivery_re_exec(int);
 
 extern BOOL    directory_make(const uschar *, const uschar *, int, BOOL);
 #ifndef DISABLE_DKIM
-extern uschar *dkim_exim_query_dns_txt(uschar *);
+extern uschar *dkim_exim_query_dns_txt(const uschar *);
 extern void    dkim_exim_sign_init(void);
 
 extern BOOL    dkim_transport_write_message(transport_ctx *,

diff --git a/src/src/pdkim/pdkim.c b/src/src/pdkim/pdkim.c
index 239532bb699998ac3e96ff125a10163a94a9904c..f10f206274cc537112535e163764f978ce063e05 100644 (file)
--- a/src/src/pdkim/pdkim.c
+++ b/src/src/pdkim/pdkim.c
@@ -1861,7 +1861,7 @@ return ctx->flags & PDKIM_MODE_SIGN  ||  verify_pass
 /* -------------------------------------------------------------------------- */
 
 DLLEXPORT pdkim_ctx *
-pdkim_init_verify(uschar * (*dns_txt_callback)(uschar *), BOOL dot_stuffing)
+pdkim_init_verify(uschar * (*dns_txt_callback)(const uschar *), BOOL dot_stuffing)
 {
 pdkim_ctx * ctx;
 
@@ -2018,7 +2018,7 @@ return b;
 
 void
 pdkim_init_context(pdkim_ctx * ctx, BOOL dot_stuffed,
-  uschar * (*dns_txt_callback)(uschar *))
+  uschar * (*dns_txt_callback)(const uschar *))
 {
 memset(ctx, 0, sizeof(pdkim_ctx));
 ctx->flags = dot_stuffed ? PDKIM_MODE_SIGN | PDKIM_DOT_TERM : PDKIM_MODE_SIGN;

diff --git a/src/src/pdkim/pdkim.h b/src/src/pdkim/pdkim.h
index 0293875491a57b63c884963208faa2da507f9d35..b2f586ca1b6c12b44d517e99b407ff7823b54b92 100644 (file)
--- a/src/src/pdkim/pdkim.h
+++ b/src/src/pdkim/pdkim.h
@@ -280,7 +280,7 @@ typedef struct pdkim_ctx {
   pdkim_bodyhash *bodyhash;
 
   /* Callback for dns/txt query method (verification only) */
-  uschar * (*dns_txt_callback)(uschar *);
+  uschar * (*dns_txt_callback)(const uschar *);
 
   /* Coder's little helpers */
   gstring   *cur_header;
@@ -313,7 +313,7 @@ extern "C" {
 
 void      pdkim_init         (void);
 
-void      pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(uschar *));
+void      pdkim_init_context (pdkim_ctx *, BOOL, uschar * (*)(const uschar *));
 
 DLLEXPORT
 pdkim_signature *pdkim_init_sign    (pdkim_ctx *,
@@ -321,7 +321,7 @@ pdkim_signature *pdkim_init_sign    (pdkim_ctx *,
                               const uschar **);
 
 DLLEXPORT
-pdkim_ctx *pdkim_init_verify  (uschar * (*)(uschar *), BOOL);
+pdkim_ctx *pdkim_init_verify  (uschar * (*)(const uschar *), BOOL);
 
 DLLEXPORT
 void       pdkim_set_optional (pdkim_signature *, char *, char *,int, int,