[opendmarc-dev] patch for ticket 54

[Andreas Schulze]

Hi

my "solution" ...

Index: opendmarc-1.1.3/reports/opendmarc-reports.in
===================================================================
--- opendmarc-1.1.3.orig/reports/opendmarc-reports.in   2013-06-13  
07:22:38.000000000 +0200
+++ opendmarc-1.1.3/reports/opendmarc-reports.in        2013-06-13  
07:30:46.000000000 +0200
@@ -632,9 +632,9 @@
                 print $tmpout "    <spf>$align_spfstr</spf>\n";
                 print $tmpout "   </policy_evaluated>\n";
                 print $tmpout "  </row>\n";
-               print $tmpout "  <identities>\n";
+               print $tmpout "  <identifiers>\n";
                 print $tmpout "   <header_from>$fromdomain</header_from>\n";
-               print $tmpout "  </identities>\n";
+               print $tmpout "  </identifiers>\n";
                 print $tmpout "  <auth_results>\n";
                 print $tmpout "   <spf>\n";
                 print $tmpout "    <domain>$envdomain</domain>\n";
Index: opendmarc-1.1.3/reports/opendmarc-reports
===================================================================
--- opendmarc-1.1.3.orig/reports/opendmarc-reports      2013-06-13  
07:22:38.000000000 +0200
+++ opendmarc-1.1.3/reports/opendmarc-reports   2013-06-13  
07:30:46.000000000 +0200
@@ -632,9 +632,9 @@
                 print $tmpout "    <spf>$align_spfstr</spf>\n";
                 print $tmpout "   </policy_evaluated>\n";
                 print $tmpout "  </row>\n";
-               print $tmpout "  <identities>\n";
+               print $tmpout "  <identifiers>\n";
                 print $tmpout "   <header_from>$fromdomain</header_from>\n";
-               print $tmpout "  </identities>\n";
+               print $tmpout "  </identifiers>\n";
                 print $tmpout "  <auth_results>\n";
                 print $tmpout "   <spf>\n";
                 print $tmpout "    <domain>$envdomain</domain>\n";
Index: opendmarc-1.1.3/libopendmarc/opendmarc_xml.c
===================================================================
--- opendmarc-1.1.3.orig/libopendmarc/opendmarc_xml.c   2013-06-13  
07:31:00.000000000 +0200
+++ opendmarc-1.1.3/libopendmarc/opendmarc_xml.c        2013-06-13  
07:31:38.000000000 +0200
@@ -475,6 +475,13 @@
                                         (void)  
strlcat(reason_comment, " ", sizeof reason_comment);
                                 (void) strlcat(reason_comment, cp,  
sizeof reason_comment);
                         }
+                       /* sca, 20130613
+                        * http://sourceforge.net/p/opendmarc/tickets/54/
+                        * why is "identities" used here? I didn't  
found it in any dmarc spec
+                        * is this a workaround to an other known  
broken source of rua reports?
+                        * if yes, it should mentioned here or in a README
+                        * if not, may it be removed ?
+                        */
                         else if (sidx > 0 &&  
(strcasecmp(stack[sidx-1], "identities") == 0 ||
                                  strcasecmp(stack[sidx-1],  
"identifiers") == 0) &&
                                  strcasecmp(stack[sidx], "header_from") == 0)