Fix DKIM signing to always ;-terminate. Bug 2295

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

diff --git a/src/src/lss.c b/src/src/lss.c
index 78c48799c70f04a76c8de83014c2f9d9a990d869..167522d2f1900fb3eae847008e9e78787317cd85 100644 (file)
--- a/src/src/lss.c
+++ b/src/src/lss.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/lss.c,v 1.5 2009/11/16 19:50:37 nm4 Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2015 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Support functions for calling from local_scan(). These are mostly just
@@ -29,7 +27,7 @@ Returns:         OK/FAIL/DEFER
 int
 lss_match_domain(uschar *domain, uschar *list)
 {
-return match_isinlist(domain, &list, 0, &domainlist_anchor, NULL, MCL_DOMAIN,
+return match_isinlist(CUS domain, CUSS &list, 0, &domainlist_anchor, NULL, MCL_DOMAIN,
   TRUE, NULL);
 }
 
@@ -51,7 +49,7 @@ Returns:         OK/FAIL/DEFER
 int
 lss_match_local_part(uschar *local_part, uschar *list, BOOL caseless)
 {
-return match_isinlist(local_part, &list, 0, &localpartlist_anchor, NULL,
+return match_isinlist(CUS local_part, CUSS &list, 0, &localpartlist_anchor, NULL,
   MCL_LOCALPART, caseless, NULL);
 }
 
@@ -73,7 +71,7 @@ Returns:         OK/FAIL/DEFER
 int
 lss_match_address(uschar *address, uschar *list, BOOL caseless)
 {
-return match_address_list(address, caseless, TRUE, &list, NULL, -1, 0, NULL);
+return match_address_list(CUS address, caseless, TRUE, CUSS &list, NULL, -1, 0, NULL);
 }
 
 
@@ -97,7 +95,7 @@ Returns:         OK/FAIL/DEFER
 int
 lss_match_host(uschar *host_name, uschar *host_address, uschar *list)
 {
-return verify_check_this_host(&list, NULL, host_name, host_address, NULL);
+return verify_check_this_host(CUSS &list, NULL, host_name, host_address, NULL);
 }
 
 
@@ -117,9 +115,9 @@ Returns:      a pointer to the zero-terminated base 64 string, which
 */
 
 uschar *
-lss_b64encode(uschar *clear, int len)
+lss_b64encode(uschar * clear, int len)
 {
-return auth_b64encode(clear, len);
+return b64encode(CUS clear, len);
 }
 
 /*
@@ -137,7 +135,7 @@ be interpreted as text. This is not included in the count. */
 int
 lss_b64decode(uschar *code, uschar **ptr)
 {
-return auth_b64decode(code, ptr);
+return b64decode(code, ptr);
 }