[exim-cvs] Return multi-values attributes from an LDAP looku…

Commit:     7bba24ebe4e17b40cbcca88fdb3f247f7f9cd02c
Parent:     076b11e243d3bfe69a9dd123f45c422104ae3057
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Apr 23 21:46:03 2012 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue May 1 20:58:02 2012 +0100

    Return multi-values attributes from an LDAP lookup in parsable form (bug 660).
---
 src/src/lookups/ldap.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/src/lookups/ldap.c b/src/src/lookups/ldap.c
index 52972fc..698928a 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 */