X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fmatch.c;h=97a098205e95dd5ce9e897c2ae98d9e6b9f455f3;hb=a466d09b249d5018ecb0f1ec45adba545c02c75b;hp=ae1d90149b27034dd08e2a93e401adc4d9017c16;hpb=d52120f2b5b5464091a61a47fe881a6e8f6ec09f;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/match.c b/src/src/match.c
index ae1d90149..97a098205 100644
--- a/src/src/match.c
+++ b/src/src/match.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/match.c,v 1.18 2007/06/26 09:23:34 ph10 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2009 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for matching strings */
@@ -223,6 +221,8 @@ if (cb->at_is_special && pattern[0] == '@')
       NULL,                /* service name not relevant */
       NULL,                /* srv_fail_domains not relevant */
       NULL,                /* mx_fail_domains not relevant */
+      NULL,                /* no dnssec request XXX ? */
+      NULL,                /* no dnssec require XXX ? */
       NULL,                /* no feedback FQDN */
       &removed);           /* feedback if local removed */
 
@@ -730,7 +730,7 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
 
     else
       {
-      uschar *error;
+      uschar *error = NULL;
       switch ((func)(arg, ss, valueptr, &error))
         {
         case OK:
@@ -747,8 +747,6 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
             error);
           break;
           }
-        HDEBUG(D_lists) debug_printf("%s %s (%s)\n", ot,
-          include_defer? "yes":"no", error);
         if (include_defer)
           {
           log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
@@ -862,8 +860,6 @@ while ((sss = string_nextinlist(&list, &sep, buffer, sizeof(buffer))) != NULL)
           break;
           }
         (void)fclose(f);
-        HDEBUG(D_lists) debug_printf("%s %s (%s)\n", ot,
-          include_defer? "yes":"no", error);
         if (include_defer)
           {
           log_write(0, LOG_MAIN, "%s: accepted by +include_defer", error);
@@ -1016,7 +1012,7 @@ uschar *s, *pdomain, *sdomain;
 
 error = error;  /* Keep clever compilers from complaining */
 
-DEBUG(D_lists) debug_printf("address match: subject=%s pattern=%s\n",
+DEBUG(D_lists) debug_printf("address match test: subject=%s pattern=%s\n",
   subject, pattern);
 
 /* Find the subject's domain */