label quoter pools with names

diff --git a/src/src/acl.c b/src/src/acl.c
index 3f1ff65cbd6377df37d21d4c9632421809fae4d1..4f010c9257223de03e7edc63180d1a9cf1fc3534 100644 (file)
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -5015,13 +5015,11 @@ FILE * f = (FILE *)ctx;
 putc('-', f);
 if (is_tainted(value))
   {
 putc('-', f);
 if (is_tainted(value))
   {

-  int q = quoter_for_address(value);
+  const uschar * quoter_name;

   putc('-', f);
   putc('-', f);

-  if (is_real_quoter(q))
-    {
-    const lookup_info * li = lookup_with_acq_num(q);
-    fprintf(f, "(%s)", li ? li->name : US"???");
-    }
+  (void) quoter_for_address(value, &quoter_name);
+  if (quoter_name)
+    fprintf(f, "(%s)", quoter_name);

   }
 fprintf(f, "acl%c %s %d\n%s\n", name[0], name+1, Ustrlen(value), value);
 }
   }
 fprintf(f, "acl%c %s %d\n%s\n", name[0], name+1, Ustrlen(value), value);
 }

diff --git a/src/src/drtables.c b/src/src/drtables.c
index d25db887f160e3ad2302e71b7b86973d3dc66b6b..0c3dd70491099e1a33be7c0960c2ea724fc07ef5 100644 (file)
--- a/src/src/drtables.c
+++ b/src/src/drtables.c
@@ -250,6 +250,8 @@ for (int j = 0; j < lmi->lookupcount; j++)
 
 
 
 
 
 

+/* Hunt for the lookup with the given acquisition number */
+

 static unsigned hunt_acq;
 
 static void
 static unsigned hunt_acq;
 
 static void


@@ -259,7 +261,6 @@ lookup_info * li = (lookup_info *)ptr;
 if (li->acq_num == hunt_acq) *(lookup_info **)ctx = li;
 }
 
 if (li->acq_num == hunt_acq) *(lookup_info **)ctx = li;
 }
 

-/*XXX many of the calls here could instead use a name on the quoted-pool */

 const lookup_info *
 lookup_with_acq_num(unsigned k)
 {
 const lookup_info *
 lookup_with_acq_num(unsigned k)
 {

diff --git a/src/src/lookups/ibase.c b/src/src/lookups/ibase.c
index 7e4973e01120bfd6cf3f1da65900a56451a5d493..6125b75b705dc2578293d23f6ab63bd8b67f1ffe 100644 (file)
--- a/src/src/lookups/ibase.c
+++ b/src/src/lookups/ibase.c
@@ -511,7 +511,7 @@ if (opt)
 while ((c = *t++))
   if (c == '\'') count++;
 
 while ((c = *t++))
   if (c == '\'') count++;
 

-t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx, US(ibase));

 
 while ((c = *s++))
   if (c == '\'') { *t++ = '\''; *t++ = '\''; }
 
 while ((c = *s++))
   if (c == '\'') { *t++ = '\''; *t++ = '\''; }

diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index ee4099419a3ccb503d0bc994c98b66017970aca3..685a9afb0967046d261c36d1f22311cf10ae4271 100644 (file)
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -1467,7 +1467,7 @@ while ((c = *t++))
 
 /* Get sufficient store to hold the quoted string */
 
 
 /* Get sufficient store to hold the quoted string */
 

-t = quoted = store_get_quoted(len + count + 1, s, idx);
+t = quoted = store_get_quoted(len + count + 1, s, idx, US"ldap");

 
 /* Handle plain quote_ldap */
 
 
 /* Handle plain quote_ldap */
 

diff --git a/src/src/lookups/mysql.c b/src/src/lookups/mysql.c
index 7e0343233fc931603de27b38548f76251b750e2b..6b4638f709a83944940f7b38b81f7542919c06d0 100644 (file)
--- a/src/src/lookups/mysql.c
+++ b/src/src/lookups/mysql.c
@@ -433,7 +433,7 @@ while ((c = *t++))
 /* Old code:  if (count == 0) return s;
 Now always allocate and copy, to track the quoted status. */
 
 /* Old code:  if (count == 0) return s;
 Now always allocate and copy, to track the quoted status. */
 

-t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx, US"mysql");

 
 while ((c = *s++))
   {
 
 while ((c = *s++))
   {

diff --git a/src/src/lookups/nisplus.c b/src/src/lookups/nisplus.c
index 3f89c7f815703fa40aa8339d5c61be7b8fdde2e0..7d11c04123edd64ca8abc913ffb438319c54c15f 100644 (file)
--- a/src/src/lookups/nisplus.c
+++ b/src/src/lookups/nisplus.c
@@ -242,7 +242,7 @@ if (opt) return NULL;    /* No options recognized */
 
 while (*t) if (*t++ == '\"') count++;
 
 
 while (*t) if (*t++ == '\"') count++;
 

-t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx, US"nisplus");

 
 while (*s)
   {
 
 while (*s)
   {

diff --git a/src/src/lookups/oracle.c b/src/src/lookups/oracle.c
index 9eb936b25da466350210a72eea713af62387538f..61285ea05f6b74b09733e05a5c2e9b0d8edc8e8a 100644 (file)
--- a/src/src/lookups/oracle.c
+++ b/src/src/lookups/oracle.c
@@ -560,7 +560,7 @@ if (opt) return NULL;    /* No options are recognized */
 while ((c = *t++))
   if (strchr("\n\t\r\b\'\"\\", c) != NULL) count++;
 
 while ((c = *t++))
   if (strchr("\n\t\r\b\'\"\\", c) != NULL) count++;
 

-t = quoted = store_get_quoted((int)Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted((int)Ustrlen(s) + count + 1, s, idx, US"oracle");

 
 while ((c = *s++))
   {
 
 while ((c = *s++))
   {

diff --git a/src/src/lookups/pgsql.c b/src/src/lookups/pgsql.c
index 144663f39f758d98851cc102b3f5d21c68fed38a..9d97afca9cecc6e3360b0adbb8661f2d03f93a32 100644 (file)
--- a/src/src/lookups/pgsql.c
+++ b/src/src/lookups/pgsql.c
@@ -431,7 +431,7 @@ if (opt) return NULL;     /* No options recognized */
 while ((c = *t++))
   if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
 
 while ((c = *t++))
   if (Ustrchr("\n\t\r\b\'\"\\", c) != NULL) count++;
 

-t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx, US"pgsql");

 
 while ((c = *s++))
   {
 
 while ((c = *s++))
   {

diff --git a/src/src/lookups/redis.c b/src/src/lookups/redis.c
index a97496ba66db937100d41fb77eb3fe1333b9e9e8..9d3f2d44bd7b5573c7ca1da5abccd70066f554aa 100644 (file)
--- a/src/src/lookups/redis.c
+++ b/src/src/lookups/redis.c
@@ -416,7 +416,7 @@ if (opt) return NULL;     /* No options recognized */
 while ((c = *t++))
   if (isspace(c) || c == '\\') count++;
 
 while ((c = *t++))
   if (isspace(c) || c == '\\') count++;
 

-t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx);
+t = quoted = store_get_quoted(Ustrlen(s) + count + 1, s, idx, US"redis");

 
 while ((c = *s++))
   {
 
 while ((c = *s++))
   {

diff --git a/src/src/lookups/sqlite.c b/src/src/lookups/sqlite.c
index 9f6c9e5aa1ae5fd07eafd89f0a00e4d132de095b..82c4ec12a9d3c78a28d1e4343ad0442172d31984 100644 (file)
--- a/src/src/lookups/sqlite.c
+++ b/src/src/lookups/sqlite.c
@@ -143,7 +143,7 @@ if (opt) return NULL;     /* No options recognized */
 while ((c = *t++)) if (c == '\'') count++;
 count += t - s;
 
 while ((c = *t++)) if (c == '\'') count++;
 count += t - s;
 

-t = quoted = store_get_quoted(count + 1, s, idx);
+t = quoted = store_get_quoted(count + 1, s, idx, US"sqlite");

 
 while ((c = *s++))
   {
 
 while ((c = *s++))
   {

diff --git a/src/src/search.c b/src/src/search.c
index 5078920f154b11448eb9c059fbc54c4b15c2cd59..efa720f257cbf825765332041a7d04cb3a4f4d7e 100644 (file)
--- a/src/src/search.c
+++ b/src/src/search.c
@@ -514,7 +514,7 @@ search_cache * c = (search_cache *)(t->data.ptr);
 const lookup_info * li = c->li;
 expiring_data * e = NULL;      /* compiler quietening */
 uschar * data = NULL;
 const lookup_info * li = c->li;
 expiring_data * e = NULL;      /* compiler quietening */
 uschar * data = NULL;

-int quoter_id = li->acq_num;
+int required_quoter_id = li->acq_num;

 int old_pool = store_pool;
 
 /* Lookups that return DEFER may not always set an error message. So that
 int old_pool = store_pool;
 
 /* Lookups that return DEFER may not always set an error message. So that


@@ -577,11 +577,11 @@ else
 
   XXX Should we this move into lf_sqlperform() ?  The server-taint check is there.
   Also it already knows about looking for a "servers" spec in the query string.
 
   XXX Should we this move into lf_sqlperform() ?  The server-taint check is there.
   Also it already knows about looking for a "servers" spec in the query string.

-  Passing quoter_id down that far is an issue.
+  Passing required_quoter_id down that far is an issue.

   */
 
   if (  !filename && li->quote
   */
 
   if (  !filename && li->quote

-     && is_tainted(keystring) && !is_quoted_like(keystring, quoter_id))
+     && is_tainted(keystring) && !is_quoted_like(keystring, required_quoter_id))

     {
     const uschar * ks = keystring;
     uschar * loc = acl_current_verb();
     {
     const uschar * ks = keystring;
     uschar * loc = acl_current_verb();


@@ -613,13 +613,12 @@ else
 
     DEBUG(D_lookup)
       {
 
     DEBUG(D_lookup)
       {

-      int q = quoter_for_address(ks);
-      const lookup_info * qli = lookup_with_acq_num(q);
+      const uschar * quoter_name;
+      int q = quoter_for_address(ks, &quoter_name);

 
 

-      debug_printf_indent("quoter_id %d (%s) quoting %d (%s)\n",
-       quoter_id, li->name,
-       q,
-       is_real_quoter(q) ? qli ? qli->name : US"???" : US"none");
+      debug_printf_indent("required_quoter_id %d (%s) quoting %d (%s)\n",
+       required_quoter_id, li->name,
+       q, quoter_name);

       }
 #endif
     }
       }
 #endif
     }

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 76b2f615b2fcebd661a73508ba989f24bbf0ea35..bb54571beb96025601df67aedfbf8029b80c45b2 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -526,7 +526,7 @@ for (;;)
        where = NULL;
        goto SPOOL_FORMAT_ERROR;
        }
        where = NULL;
        goto SPOOL_FORMAT_ERROR;
        }

-      proto_mem = store_get_quoted(1, GET_TAINTED, li->acq_num);
+      proto_mem = store_get_quoted(1, GET_TAINTED, li->acq_num, li->name);

       }
 #endif  /* COMPILE_UTILITY */
     var = s + 1;
       }
 #endif  /* COMPILE_UTILITY */
     var = s + 1;

diff --git a/src/src/spool_out.c b/src/src/spool_out.c
index e1972aa4400d278227667ddb5679707fa3a079df..78bf48cadf05c2b24bdf7facf72e06f7aeaa77dc 100644 (file)
--- a/src/src/spool_out.c
+++ b/src/src/spool_out.c
@@ -124,13 +124,11 @@ spool_var_write(FILE * fp, const uschar * name, const uschar * val)
 putc('-', fp);
 if (is_tainted(val))
   {
 putc('-', fp);
 if (is_tainted(val))
   {

-  int q = quoter_for_address(val);
+  const uschar * quoter_name;

   putc('-', fp);
   putc('-', fp);

-  if (is_real_quoter(q))
-    {
-    const lookup_info * li = lookup_with_acq_num(q);
-    fprintf(fp, "(%s)", li ? li->name : US"unknown!");
-    }
+  (void) quoter_for_address(val, &quoter_name);
+  if (quoter_name)
+    fprintf(fp, "(%s)", quoter_name);

   }
 fprintf(fp, "%s %s\n", name, val);
 }
   }
 fprintf(fp, "%s %s\n", name, val);
 }

diff --git a/src/src/store.c b/src/src/store.c
index 09f812dfd824dec947b22d8a4e93bf0d1caec692..c135b43839f081a1d75657e1e75663341f54a4bb 100644 (file)
--- a/src/src/store.c
+++ b/src/src/store.c
@@ -132,6 +132,7 @@ typedef struct pooldesc {
 typedef struct quoted_pooldesc {
   pooldesc                     pool;
   unsigned                     quoter;
 typedef struct quoted_pooldesc {
   pooldesc                     pool;
   unsigned                     quoter;

+  const unsigned char *                quoter_name;

   struct quoted_pooldesc *     next;
 } quoted_pooldesc;
 
   struct quoted_pooldesc *     next;
 } quoted_pooldesc;
 


@@ -335,24 +336,27 @@ log_write(0, LOG_MAIN|LOG_PANIC_DIE, "Taint mismatch, %s: %s %d\n",
 /* Return the pool for the given quoter, or null */
 
 static pooldesc *
 /* Return the pool for the given quoter, or null */
 
 static pooldesc *

-pool_for_quoter(unsigned quoter)
+pool_for_quoter(unsigned quoter, const uschar ** namep)

 {
 for (quoted_pooldesc * qp = quoted_pools; qp; qp = qp->next)
   if (qp->quoter == quoter)
 {
 for (quoted_pooldesc * qp = quoted_pools; qp; qp = qp->next)
   if (qp->quoter == quoter)

+    {
+    if (namep) *namep = qp->quoter_name;

     return &qp->pool;
     return &qp->pool;

+    }

 return NULL;
 }
 
 /* Allocate/init a new quoted-pool and return the pool */
 
 static pooldesc *
 return NULL;
 }
 
 /* Allocate/init a new quoted-pool and return the pool */
 
 static pooldesc *

-quoted_pool_new(unsigned quoter)
+quoted_pool_new(unsigned quoter, const uschar * quoter_name)

 {
 {

-// debug_printf("allocating quoted-pool\n");

 quoted_pooldesc * qp = store_get_perm(sizeof(quoted_pooldesc), GET_UNTAINTED);
 
 pool_init(&qp->pool);
 qp->quoter = quoter;
 quoted_pooldesc * qp = store_get_perm(sizeof(quoted_pooldesc), GET_UNTAINTED);
 
 pool_init(&qp->pool);
 qp->quoter = quoter;

+qp->quoter_name = quoter_name;

 qp->next = quoted_pools;
 quoted_pools = qp;
 return &qp->pool;
 qp->next = quoted_pools;
 quoted_pools = qp;
 return &qp->pool;


@@ -504,13 +508,14 @@ void *
 store_get_3(int size, const void * proto_mem, const char * func, int linenumber)
 {
 #ifndef COMPILE_UTILITY
 store_get_3(int size, const void * proto_mem, const char * func, int linenumber)
 {
 #ifndef COMPILE_UTILITY

-int quoter = quoter_for_address(proto_mem);
+const uschar * quoter_name;
+int quoter = quoter_for_address(proto_mem, &quoter_name);

 #endif
 pooldesc * pp;
 void * yield;
 
 #ifndef COMPILE_UTILITY
 #endif
 pooldesc * pp;
 void * yield;
 
 #ifndef COMPILE_UTILITY

-if (!is_real_quoter(quoter))
+if (!quoter_name)

 #endif
   {
   BOOL tainted = is_tainted(proto_mem);
 #endif
   {
   BOOL tainted = is_tainted(proto_mem);


@@ -533,7 +538,8 @@ else
   DEBUG(D_memory)
     debug_printf("allocating quoted-block for quoter %u (from %s %d)\n",
       quoter, func, linenumber);
   DEBUG(D_memory)
     debug_printf("allocating quoted-block for quoter %u (from %s %d)\n",
       quoter, func, linenumber);

-  if (!(pp = pool_for_quoter(quoter))) pp = quoted_pool_new(quoter);
+  if (!(pp = pool_for_quoter(quoter, NULL)))
+    pp = quoted_pool_new(quoter, quoter_name);

   yield = pool_get(pp, size, FALSE, func, linenumber);
   DEBUG(D_memory)
     debug_printf("---QQ Get %6p %5d %-14s %4d\n",
   yield = pool_get(pp, size, FALSE, func, linenumber);
   DEBUG(D_memory)
     debug_printf("---QQ Get %6p %5d %-14s %4d\n",


@@ -592,16 +598,16 @@ Return:   allocated memory block
 */
 
 static void *
 */
 
 static void *

-store_force_get_quoted(int size, unsigned quoter,
+store_force_get_quoted(int size, unsigned quoter, const uschar * quoter_name,

   const char * func, int linenumber)
 {
   const char * func, int linenumber)
 {

-pooldesc * pp = pool_for_quoter(quoter);
+pooldesc * pp = pool_for_quoter(quoter, NULL);

 void * yield;
 
 DEBUG(D_memory)
   debug_printf("allocating quoted-block for quoter %u (from %s %d)\n", quoter, func, linenumber);
 
 void * yield;
 
 DEBUG(D_memory)
   debug_printf("allocating quoted-block for quoter %u (from %s %d)\n", quoter, func, linenumber);
 

-if (!pp) pp = quoted_pool_new(quoter);
+if (!pp) pp = quoted_pool_new(quoter, quoter_name);

 yield = pool_get(pp, size, FALSE, func, linenumber);
 
 DEBUG(D_memory)
 yield = pool_get(pp, size, FALSE, func, linenumber);
 
 DEBUG(D_memory)


@@ -616,32 +622,37 @@ prototype memory is tainted. Otherwise, get plain memory.
 */
 void *
 store_get_quoted_3(int size, const void * proto_mem, unsigned quoter,
 */
 void *
 store_get_quoted_3(int size, const void * proto_mem, unsigned quoter,

-  const char * func, int linenumber)
+  const uschar * quoter_name, const char * func, int linenumber)

 {
 {

-// debug_printf("store_get_quoted_3: quoter %u\n", quoter);

 return is_tainted(proto_mem)
 return is_tainted(proto_mem)

-  ? store_force_get_quoted(size, quoter, func, linenumber)
+  ? store_force_get_quoted(size, quoter, quoter_name, func, linenumber)

   : store_get_3(size, proto_mem, func, linenumber);
 }
 
 /* Return quoter for given address, or -1 if not in a quoted-pool. */
 int
   : store_get_3(size, proto_mem, func, linenumber);
 }
 
 /* Return quoter for given address, or -1 if not in a quoted-pool. */
 int

-quoter_for_address(const void * p)
+quoter_for_address(const void * p, const uschar ** namep)

 {
 {

-for (quoted_pooldesc * qp = quoted_pools; qp; qp = qp->next)
+const quoted_pooldesc * qp;
+for (qp = quoted_pools; qp; qp = qp->next)

   {
   {

-  pooldesc * pp = &qp->pool;
+  const pooldesc * pp = &qp->pool;

   storeblock * b;
 
   if (b = pp->current_block)
     if (is_pointer_in_block(b, p))
   storeblock * b;
 
   if (b = pp->current_block)
     if (is_pointer_in_block(b, p))

-      return qp->quoter;
+      goto found;

 
   for (b = pp->chainbase; b; b = b->next)
     if (is_pointer_in_block(b, p))
 
   for (b = pp->chainbase; b; b = b->next)
     if (is_pointer_in_block(b, p))

-      return qp->quoter;
+      goto found;

   }
   }

+if (namep) *namep = NULL;

 return -1;
 return -1;

+
+found:
+  if (namep) *namep = qp->quoter_name;
+  return qp->quoter;

 }
 
 /* Return TRUE iff the given address is quoted for the given type.
 }
 
 /* Return TRUE iff the given address is quoted for the given type.


@@ -650,12 +661,22 @@ find variants but shared quote functions. */
 BOOL
 is_quoted_like(const void * p, unsigned quoter)
 {
 BOOL
 is_quoted_like(const void * p, unsigned quoter)
 {

-int pq = quoter_for_address(p);
-const lookup_info * p_li = lookup_with_acq_num(pq);
-void * p_qfn = p_li ? p_li->quote : NULL;
-const lookup_info * q_li = lookup_with_acq_num(quoter);
-void * q_qfn = q_li ? q_li->quote : NULL;
-BOOL y = is_real_quoter(pq) && p_qfn == q_qfn;
+const uschar * p_name, * q_name;
+const lookup_info * p_li, * q_li;
+void * p_qfn, * q_qfn;
+
+(void) quoter_for_address(p, &p_name);
+(void) pool_for_quoter(quoter, &q_name);
+
+if (!p_name || !q_name) return FALSE;
+
+p_li = search_findtype(p_name, Ustrlen(p_name));
+p_qfn = p_li ? p_li->quote : NULL;
+q_li = search_findtype(q_name, Ustrlen(q_name));
+q_qfn = q_li ? q_li->quote : NULL;
+
+BOOL y = p_qfn == q_qfn;
+

 /* debug_printf("is_quoted(%p, %u): %c\n", p, quoter, y?'T':'F'); */
 return y;
 }
 /* debug_printf("is_quoted(%p, %u): %c\n", p, quoter, y?'T':'F'); */
 return y;
 }


@@ -667,6 +688,7 @@ is_real_quoter(int quoter)
 return quoter >= 0;
 }
 
 return quoter >= 0;
 }
 

+

 /* Return TRUE if the "new" data requires that the "old" data
 be recopied to new-class memory.  We order the classes as
 
 /* Return TRUE if the "new" data requires that the "old" data
 be recopied to new-class memory.  We order the classes as
 


@@ -684,8 +706,8 @@ is_incompatible_fn(const void * old, const void * new)
 int oq, nq;
 unsigned oi, ni;
 
 int oq, nq;
 unsigned oi, ni;
 

-ni = is_real_quoter(nq = quoter_for_address(new)) ? 1 : is_tainted(new) ? 2 : 0;
-oi = is_real_quoter(oq = quoter_for_address(old)) ? 1 : is_tainted(old) ? 2 : 0;
+ni = is_real_quoter(nq = quoter_for_address(new, NULL)) ? 1 : is_tainted(new) ? 2 : 0;
+oi = is_real_quoter(oq = quoter_for_address(old, NULL)) ? 1 : is_tainted(old) ? 2 : 0;

 return ni > oi || ni == oi && nq != oq;
 }
 
 return ni > oi || ni == oi && nq != oq;
 }
 


@@ -1257,10 +1279,9 @@ DEBUG(D_memory)
  for (quoted_pooldesc * qp = quoted_pools; qp; i++, qp = qp->next)
    {
    pooldesc * pp = &qp->pool;
  for (quoted_pooldesc * qp = quoted_pools; qp; i++, qp = qp->next)
    {
    pooldesc * pp = &qp->pool;

-   const lookup_info* li = lookup_with_acq_num(qp->quoter);

    debug_printf("----Exit  pool Q%d max: %3d kB in %d blocks at order %u\ttainted quoted:%s\n",
     i, (pp->maxbytes+1023)/1024, pp->maxblocks, pp->maxorder,
    debug_printf("----Exit  pool Q%d max: %3d kB in %d blocks at order %u\ttainted quoted:%s\n",
     i, (pp->maxbytes+1023)/1024, pp->maxblocks, pp->maxorder,

-    li ? li->name : US"???");
+    qp->quoter_name);

    }
  }
 #endif
    }
  }
 #endif


@@ -1299,14 +1320,12 @@ store_pool = oldpool;
 void
 debug_print_taint(const void * p)
 {
 void
 debug_print_taint(const void * p)
 {

-int q = quoter_for_address(p);
+const uschar * quoter_name;

 if (!is_tainted(p)) return;
 debug_printf("(tainted");
 if (!is_tainted(p)) return;
 debug_printf("(tainted");

-if (is_real_quoter(q))
-  {
-  const lookup_info * li = lookup_with_acq_num(q);
-  debug_printf(", quoted:%s", li ? li->name : US"???");
-  }
+(void) quoter_for_address(p, &quoter_name);
+if (quoter_name)
+  debug_printf(", quoted:%s", quoter_name);

 debug_printf(")\n");
 }
 #endif
 debug_printf(")\n");
 }
 #endif

diff --git a/src/src/store.h b/src/src/store.h
index 834457aaac6a646d45f9eda6aa16b8bc39829884..f088647f16df314d181cfe30a3c55d832af88591 100644 (file)
--- a/src/src/store.h
+++ b/src/src/store.h
@@ -50,8 +50,9 @@ tracing information for debugging. */
 #define store_free(addr) \
        store_free_3(addr, __FUNCTION__, __LINE__)
 /* store_get & store_get_perm are in local_scan.h */
 #define store_free(addr) \
        store_free_3(addr, __FUNCTION__, __LINE__)
 /* store_get & store_get_perm are in local_scan.h */

-#define store_get_quoted(size, proto_mem, quoter) \
-       store_get_quoted_3((size), (proto_mem), (quoter), __FUNCTION__, __LINE__)
+#define store_get_quoted(size, proto_mem, quoter, quoter_name) \
+       store_get_quoted_3((size), (proto_mem), (quoter), (quoter_name), \
+                         __FUNCTION__, __LINE__)

 #define store_malloc(size) \
        store_malloc_3(size, __FUNCTION__, __LINE__)
 #define store_mark(void) \
 #define store_malloc(size) \
        store_malloc_3(size, __FUNCTION__, __LINE__)
 #define store_mark(void) \


@@ -70,7 +71,8 @@ typedef void ** rmark;
 extern BOOL    store_extend_3(void *, int, int, const char *, int);
 extern void    store_free_3(void *, const char *, int);
 /* store_get_3 & store_get_perm_3 are in local_scan.h */
 extern BOOL    store_extend_3(void *, int, int, const char *, int);
 extern void    store_free_3(void *, const char *, int);
 /* store_get_3 & store_get_perm_3 are in local_scan.h */

-extern void *  store_get_quoted_3(int, const void *, unsigned, const char *, int);
+extern void *  store_get_quoted_3(int, const void *, unsigned, const uschar *,
+                 const char *, int);

 extern void *  store_malloc_3(size_t, const char *, int)               ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT;
 extern rmark   store_mark_3(const char *, int);
 extern void *  store_newblock_3(void *, int, int, const char *, int);
 extern void *  store_malloc_3(size_t, const char *, int)               ALLOC ALLOC_SIZE(1) WARN_UNUSED_RESULT;
 extern rmark   store_mark_3(const char *, int);
 extern void *  store_newblock_3(void *, int, int, const char *, int);


@@ -80,7 +82,7 @@ extern rmark   store_reset_3(rmark, const char *, int);
 #define GET_UNTAINTED  (const void *)0
 #define GET_TAINTED    (const void *)1
 
 #define GET_UNTAINTED  (const void *)0
 #define GET_TAINTED    (const void *)1
 

-extern int     quoter_for_address(const void *);
+extern int     quoter_for_address(const void *, const uschar **);

 extern BOOL    is_quoted_like(const void *, unsigned);
 extern BOOL    is_real_quoter(int);
 extern void    debug_print_taint(const void * p);
 extern BOOL    is_quoted_like(const void *, unsigned);
 extern BOOL    is_real_quoter(int);
 extern void    debug_print_taint(const void * p);

diff --git a/test/runtest b/test/runtest
index ab8371942d7ca1b17dcbaa5d6ff822272a69507c..e806244848ab6ae7d91994b056f715f931c9d48f 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1471,7 +1471,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       }
 
     # Different builds will have different lookup types included
       }
 
     # Different builds will have different lookup types included

-    s/quoter_id \K\d+ \((\w+)\) quoting -1 \(none\)$/NN ($1) quoting -1 (none)/;
+    s/required_quoter_id \K\d+ \((\w+)\) quoting -1 \(NULL\)$/NN ($1) quoting -1 (NULL)/;

     # and different numbers of lookup types result in different type-code letters,
     # so convert them all to "0"
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
     # and different numbers of lookup types result in different type-code letters,
     # so convert them all to "0"
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;

diff --git a/test/stderr/2610 b/test/stderr/2610
index 0f62df1c0b4a612b0f957c1f643df5a621fd13cd..c762e0340a33adb8e440e4f9b5f05da6b8c55557 100644 (file)
--- a/test/stderr/2610
+++ b/test/stderr/2610
@@ -381,7 +381,7 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root
 01:01:01 p1235                                (tainted)
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 26): select name from them where id = 'c'
 01:01:01 p1235                                (tainted)
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 26): select name from them where id = 'c'

-01:01:01 p1235   quoter_id NN (mysql) quoting -1 (none)
+01:01:01 p1235   required_quoter_id NN (mysql) quoting -1 (NULL)

 01:01:01 p1235   MySQL query: "select name from them where id = 'c'" opts 'no_rd'
 01:01:01 p1235   MYSQL using cached connection for 127.0.0.1:PORT_N/test/root
 01:01:01 p1235   MYSQL: no data found
 01:01:01 p1235   MySQL query: "select name from them where id = 'c'" opts 'no_rd'
 01:01:01 p1235   MYSQL using cached connection for 127.0.0.1:PORT_N/test/root
 01:01:01 p1235   MYSQL: no data found


@@ -540,7 +540,7 @@ close MYSQL connection: 127.0.0.1:PORT_N/test/root
 01:01:01 p1235                                (tainted)
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 39): select name from them where id = 'c'
 01:01:01 p1235                                (tainted)
 01:01:01 p1235  LOG: MAIN PANIC
 01:01:01 p1235    tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 39): select name from them where id = 'c'

-01:01:01 p1235   quoter_id NN (mysql) quoting -1 (none)
+01:01:01 p1235   required_quoter_id NN (mysql) quoting -1 (NULL)

 01:01:01 p1235   MySQL query: "servers=127.0.0.1::PORT_N; select name from them where id = 'c'" opts 'NULL'
 01:01:01 p1235  LOG: MAIN
 01:01:01 p1235    Exim configuration error in line 89 of TESTSUITE/test-config:
 01:01:01 p1235   MySQL query: "servers=127.0.0.1::PORT_N; select name from them where id = 'c'" opts 'NULL'
 01:01:01 p1235  LOG: MAIN
 01:01:01 p1235    Exim configuration error in line 89 of TESTSUITE/test-config:


@@ -846,7 +846,7 @@ processing address_data
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (router r1, TESTSUITE/test-config 68): select name from them where id='ph10' limit 1
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (router r1, TESTSUITE/test-config 68): select name from them where id='ph10' limit 1

- quoter_id NN (mysql) quoting -1 (none)
+ required_quoter_id NN (mysql) quoting -1 (NULL)

  MySQL query: "select name from them where id='ph10' limit 1" opts 'NULL'
  MYSQL using cached connection for 127.0.0.1:PORT_N/test/root
  creating new cache entry
  MySQL query: "select name from them where id='ph10' limit 1" opts 'NULL'
  MYSQL using cached connection for 127.0.0.1:PORT_N/test/root
  creating new cache entry


@@ -890,7 +890,7 @@ appendfile transport entered
                               (tainted)
 LOG: MAIN
   tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 82): select id from them where id='ph10'
                               (tainted)
 LOG: MAIN
   tainted search query is not properly quoted (transport t1, TESTSUITE/test-config 82): select id from them where id='ph10'

- quoter_id NN (mysql) quoting -1 (none)
+ required_quoter_id NN (mysql) quoting -1 (NULL)

  MySQL query: "select id from them where id='ph10'" opts 'NULL'
  MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root
  creating new cache entry
  MySQL query: "select id from them where id='ph10'" opts 'NULL'
  MYSQL new connection: host=127.0.0.1 port=PORT_N socket=NULL database=test user=root
  creating new cache entry

diff --git a/test/stderr/2620 b/test/stderr/2620
index f0538e83f195f6662ec301ae0aba248c04f5fd2f..0d42feccbb9365f2106f08e5b8eac0243760f789 100644 (file)
--- a/test/stderr/2620
+++ b/test/stderr/2620
@@ -295,7 +295,7 @@ check set acl_m0 = ok:   ${lookup pgsql                    {select name from the
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c'
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c'

- quoter_id NN (pgsql) quoting -1 (none)
+ required_quoter_id NN (pgsql) quoting -1 (NULL)

  PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
  PGSQL using cached connection for localhost:PORT_N/test/CALLER
  PGSQL: no data found
  PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
  PGSQL using cached connection for localhost:PORT_N/test/CALLER
  PGSQL: no data found


@@ -490,7 +490,7 @@ check set acl_m0 = ok:   ${lookup pgsql                    {select name from the
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c'
                               (tainted)
 LOG: MAIN PANIC
   tainted search query is not properly quoted (ACL warn, TESTSUITE/test-config 27): select name from them where id = 'c'

- quoter_id NN (pgsql) quoting -1 (none)
+ required_quoter_id NN (pgsql) quoting -1 (NULL)

  PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
  PGSQL using cached connection for localhost:PORT_N/test/CALLER
  PGSQL: no data found
  PostgreSQL query: "select name from them where id = 'c'" opts 'NULL'
  PGSQL using cached connection for localhost:PORT_N/test/CALLER
  PGSQL: no data found