From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 23 Apr 2012 20:46:03 +0000 (+0100)
Subject: Return multi-values attributes from an LDAP lookup in parsable form (bug 660).
X-Git-Tag: exim-4_80_RC1~46
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7bba24ebe4e17b40cbcca88fdb3f247f7f9cd02c

Return multi-values attributes from an LDAP lookup in parsable form (bug 660).
---

diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 52972fc0b..698928a6a 100644
--- a/src/src/lookups/ldap.c
+++ b/src/src/lookups/ldap.c
@@ -725,10 +725,10 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
             DEBUG(D_lookup) debug_printf("LDAP attr loop %s:%s\n", attr, value);
 
             if (values != firstval)
-              data = string_cat(data, &size, &ptr, US", ", 2);
+              data = string_cat(data, &size, &ptr, US",", 1);
 
             /* For multiple attributes, the data is in quotes. We must escape
-            internal quotes, backslashes, newlines. */
+            internal quotes, backslashes, newlines, and must double commas. */
 
             if (attr_count != 1)
               {
@@ -737,6 +737,8 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
                 {
                 if (value[j] == '\n')
                   data = string_cat(data, &size, &ptr, US"\\n", 2);
+                else if (value[j] == ',')
+                  data = string_cat(data, &size, &ptr, US",,", 2);
                 else
                   {
                   if (value[j] == '\"' || value[j] == '\\')
@@ -746,9 +748,20 @@ while ((rc = ldap_result(lcp->ld, msgid, 0, timeoutptr, &result)) ==
                 }
               }
 
-            /* For single attributes, copy the value verbatim */
+            /* For single attributes, just double commas */
+
+	    else
+	      {
+	      int j;
+	      for (j = 0; j < len; j++)
+	        {
+	        if (value[j] == ',')
+	          data = string_cat(data, &size, &ptr, US",,", 2);
+	        else
+	          data = string_cat(data, &size, &ptr, value+j, 1);
+	        }
+	      }
 
-            else data = string_cat(data, &size, &ptr, value, len);
 
             /* Move on to the next value */