Apply Jakob Hirsch's patch for arbitrary ACL variable names, tidied up

[exim.git] / src / src / spool_in.c

diff --git a/src/src/spool_in.c b/src/src/spool_in.c
index 6efe5aa27db682e973eabaf6843c7beab2aaf70e..c459140583d4bcbb13246b9272e73cc366aa60a6 100644 (file)
--- a/src/src/spool_in.c
+++ b/src/src/spool_in.c
@@ -1,10 +1,10 @@
-/* $Cambridge: exim/src/src/spool_in.c,v 1.12 2005/06/27 14:29:44 ph10 Exp $ */
+/* $Cambridge: exim/src/src/spool_in.c,v 1.16 2006/09/19 11:28:45 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2006 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for reading spool files. When compiling for a utility (eximon),
@@ -236,8 +236,7 @@ uschar *p;
 one exception. DO NOT change the default value of dont_deliver, because it may
 be forced by an external setting. */
 
-for (n = 0; n < ACL_C_MAX + ACL_M_MAX; n++) acl_var[n] = NULL;
-
+acl_var_c = acl_var_m = NULL;
 authenticated_id = NULL;
 authenticated_sender = NULL;
 allow_unqualified_recipient = FALSE;
@@ -376,22 +375,58 @@ for (;;)
   {
   if (Ufgets(big_buffer, big_buffer_size, f) == NULL) goto SPOOL_READ_ERROR;
   if (big_buffer[0] != '-') break;
-
   big_buffer[Ustrlen(big_buffer) - 1] = 0;
+
+  /* For long-term backward compatibility, we recognize "-acl", which was used
+  before the number of ACL variables changed from 10 to 20. This was before the
+  subsequent change to an arbitrary number of named variables. This code is
+  retained so that upgrades from very old versions can still handle old-format
+  spool files. The value given after "-acl" is a number that is 0-9 for
+  connection variables, and 10-19 for message variables. */
+
   if (Ustrncmp(big_buffer, "-acl ", 5) == 0)
     {
     int index, count;
+    uschar name[4];
+    tree_node *node;
+
     if (sscanf(CS big_buffer + 5, "%d %d", &index, &count) != 2)
       goto SPOOL_FORMAT_ERROR;
-    /* Ignore if index too big - might be if a later release with more
-    variables built this spool file. */
-    if (index < ACL_C_MAX + ACL_M_MAX)
-      {
-      acl_var[index] = store_get(count + 1);
-      if (fread(acl_var[index], 1, count+1, f) < count) goto SPOOL_READ_ERROR;
-      acl_var[index][count] = 0;
-      }
+
+    (void) string_format(name, 4, "%c%d", (index < 10 ? 'c' : 'm'), index);
+    node = acl_var_create(name);
+    node->data.ptr = store_get(count + 1);
+
+    if (fread(node->data.ptr, 1, count+1, f) < count) goto SPOOL_READ_ERROR;
+    ((uschar*)node->data.ptr)[count] = 0;
     }
+
+  /* Nowadays we use "-aclc" and "-aclm" for the different types of ACL
+  variable, because Exim allows any number of them, with arbitrary names.
+  The line in the spool file is "-acl[cm] <name> <length>". The name excludes
+  the c or m. */
+
+  else if (Ustrncmp(big_buffer, "-aclc ", 6) == 0 ||
+           Ustrncmp(big_buffer, "-aclm ", 6) == 0)
+    {
+    uschar *name, *endptr;
+    int count;
+    tree_node *node;
+
+    endptr = Ustrchr(big_buffer + 6, ' ');
+    if (endptr == NULL) goto SPOOL_FORMAT_ERROR;
+    name = string_sprintf("%c%.*s", big_buffer[4], endptr - big_buffer - 6,
+      big_buffer + 6);
+    if (sscanf(CS endptr, " %d", &count) != 1) goto SPOOL_FORMAT_ERROR;
+
+    node = acl_var_create(name);
+    node->data.ptr = store_get(count + 1);
+    if (fread(node->data.ptr, 1, count+1, f) < count) goto SPOOL_READ_ERROR;
+    ((uschar*)node->data.ptr)[count] = 0;
+    }
+
+  /* Other values */
+
   else if (Ustrcmp(big_buffer, "-local") == 0) sender_local = TRUE;
   else if (Ustrcmp(big_buffer, "-localerror") == 0)
     local_error_message = TRUE;
@@ -448,13 +483,13 @@ for (;;)
 
   else if (Ustrncmp(big_buffer, "-host_address", 13) == 0)
     {
-    sender_host_port = host_extract_port(big_buffer + 14);
+    sender_host_port = host_address_extract_port(big_buffer + 14);
     sender_host_address = string_copy(big_buffer + 14);
     }
 
   else if (Ustrncmp(big_buffer, "-interface_address", 18) == 0)
     {
-    interface_port = host_extract_port(big_buffer + 19);
+    interface_port = host_address_extract_port(big_buffer + 19);
     interface_address = string_copy(big_buffer + 19);
     }