File r894879.diff of Package kdepimlibs4

Subject: ldap: Quote CN parameters correctly.
From: wstephenson@suse.de
Bug: kolab#3281
Patch-upstream: 894879
--- kcal/MSExchange.ics.ical.ref	(revision 0)
+++ kcal/MSExchange.ics.ical.ref	(revision 894879)
@@ -0,0 +1,27 @@
+BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN
+VERSION:2.0
+X-LibKCal-Testsuite-OutTZ:America/New_York
+BEGIN:VEVENT
+DTSTAMP:20040122T092702Z
+ORGANIZER;CN="Shaheedur Haque":MAILTO:srhaque@ncube.com
+X-MICROSOFT-CDO-ALLDAYEVENT:FALSE
+X-MICROSOFT-CDO-BUSYSTATUS:BUSY
+X-MICROSOFT-CDO-IMPORTANCE:1
+X-MICROSOFT-CDO-INSTTYPE:1
+X-MICROSOFT-CDO-INTENDEDSTATUS:BUSY
+X-MICROSOFT-CDO-OWNERAPPTID:-1
+CREATED:20031111T180542Z
+UID:CD0000008B9511D182D800C04FB1625D2F076BC90B1B8C4E89EAD0A2BC0FC5B7
+LAST-MODIFIED:20031111T180554Z
+SUMMARY:Bob Bond's staff
+STATUS:TENTATIVE
+PRIORITY:5
+RRULE:FREQ=WEEKLY;BYDAY=MO;WKST=SU
+DTSTART:20031110T180000Z
+DTEND:20031110T190000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+END:VCALENDAR
+
--- kcal/KOrganizer_3.2.ics.ical.ref	(revision 0)
+++ kcal/KOrganizer_3.2.ics.ical.ref	(revision 894879)
@@ -0,0 +1,82 @@
+BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20040122T092701Z
+ORGANIZER:MAILTO:nobody@nowhere
+CREATED:20031213T204645Z
+UID:KOrganizer-367556625.513
+SEQUENCE:2
+LAST-MODIFIED:20031213T204657Z
+SUMMARY:Two-day all day event recurring twice every second month
+PRIORITY:5
+RRULE:FREQ=MONTHLY;COUNT=2;INTERVAL=2;BYMONTHDAY=10
+DTSTART;VALUE=DATE:20031210
+DTEND;VALUE=DATE:20031212
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092701Z
+ORGANIZER:MAILTO:nobody@nowhere
+CREATED:20031213T204326Z
+UID:KOrganizer-178854360.121
+LAST-MODIFIED:20031213T204326Z
+DESCRIPTION:Reminder 2 hours\nShow time as free\nCategories meeting\, 
+ phone call\nUmlauts: äöüÄÖÜß\nAccess: confidential\nRecurrence: 
+ twice weekly on monday.\n
+SUMMARY:Full Info
+LOCATION:location
+CLASS:CONFIDENTIAL
+PRIORITY:5
+CATEGORIES:Meeting
+CATEGORIES:Phone Call
+RRULE:FREQ=WEEKLY;COUNT=2;BYDAY=MO
+EXDATE:20031209T091500Z
+DTSTART:20031209T091500Z
+DTEND:20031209T113000Z
+TRANSP:TRANSPARENT
+BEGIN:VALARM
+DESCRIPTION:
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION:-PT2H
+END:VALARM
+
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092701Z
+ORGANIZER:MAILTO:nobody@nowhere
+ATTENDEE;CN="Hans Wurst";RSVP=TRUE;PARTSTAT=TENTATIVE;ROLE=CHAIR:mailto:
+ hw@abc.de
+CREATED:20031213T204544Z
+UID:KOrganizer-581715779.572
+LAST-MODIFIED:20031213T204544Z
+DESCRIPTION:8.12. - 11.12 13:30 - 10:30\nreminder 40 hours\nOne Attendee
+SUMMARY:Multi-Day Event
+PRIORITY:5
+DTSTART:20031208T123000Z
+DTEND:20031211T093000Z
+TRANSP:OPAQUE
+BEGIN:VALARM
+DESCRIPTION:
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION:-P1DT16H
+END:VALARM
+
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092701Z
+ORGANIZER:MAILTO:nobody@nowhere
+CREATED:20031213T204152Z
+UID:KOrganizer-101218390.515
+LAST-MODIFIED:20031213T204152Z
+SUMMARY:Holladiho
+PRIORITY:5
+DTSTART:20031213T071500Z
+DTEND:20031213T104500Z
+TRANSP:OPAQUE
+END:VEVENT
+
+END:VCALENDAR
--- kcal/icalformat_p.cpp	(revision 894878)
+++ kcal/icalformat_p.cpp	(revision 894879)
@@ -74,6 +74,13 @@ static void _dumpIcaltime( const icaltim
 */
 
 //@cond PRIVATE
+static QString quoteForParam( const QString &text )
+{
+  QString tmp = text;
+  tmp.remove( '"' );
+  return QString::fromLatin1( "\"" ) + tmp + QString::fromLatin1( "\"" );
+}
+
 const int gSecondsPerMinute = 60;
 const int gSecondsPerHour   = gSecondsPerMinute * 60;
 const int gSecondsPerDay    = gSecondsPerHour   * 24;
@@ -589,8 +596,7 @@ void ICalFormatImpl::Private::writeIncid
   // comments
   QStringList comments = incidenceBase->comments();
   for ( QStringList::Iterator it = comments.begin(); it != comments.end(); ++it ) {
-    icalcomponent_add_property(
-      parent, icalproperty_new_comment( (*it).toUtf8() ) );
+    icalcomponent_add_property( parent, icalproperty_new_comment( (*it).toUtf8() ) );
   }
 
   // custom properties
@@ -616,7 +622,7 @@ icalproperty *ICalFormatImpl::writeOrgan
 
   if ( !organizer.name().isEmpty() ) {
     icalproperty_add_parameter(
-      p, icalparameter_new_cn( organizer.name().toUtf8() ) );
+      p, icalparameter_new_cn( quoteForParam( organizer.name() ).toUtf8() ) );
   }
   // TODO: Write dir, sent-by and language
 
@@ -657,7 +663,7 @@ icalproperty *ICalFormatImpl::writeAtten
 
   if ( !attendee->name().isEmpty() ) {
     icalproperty_add_parameter(
-      p, icalparameter_new_cn( attendee->name().toUtf8() ) );
+      p, icalparameter_new_cn( quoteForParam( attendee->name() ).toUtf8() ) );
   }
 
   icalproperty_add_parameter(
@@ -935,7 +941,7 @@ icalcomponent *ICalFormatImpl::writeAlar
         "MAILTO:" + (*ad).email().toUtf8() );
       if ( !(*ad).name().isEmpty() ) {
         icalproperty_add_parameter(
-          p, icalparameter_new_cn( (*ad).name().toUtf8() ) );
+          p, icalparameter_new_cn( quoteForParam( (*ad).name() ).toUtf8() ) );
       }
       icalcomponent_add_property( a, p );
     }
--- kcal/eGroupware.ics.ical.ref	(revision 0)
+++ kcal/eGroupware.ics.ical.ref	(revision 894879)
@@ -0,0 +1,22 @@
+BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20070228T155530Z
+ATTENDEE;CN="Tobias König";RSVP=FALSE;PARTSTAT=ACCEPTED;ROLE=CHAIR:
+ mailto:tobias.koenig@kde.de
+CREATED:20070228T090007Z
+UID:calendar-4862-e77d247cfc15c40e485acfa65f636e29
+LAST-MODIFIED:20070228T090006Z
+DESCRIPTION:Das ist eine längere Notiz\ndie über meherer Zeilen 
+ geht\nmit +49 1928309812/09283498
+SUMMARY:12345
+LOCATION:Dresden
+PRIORITY:5
+DTSTART:20070301T100000Z
+DTEND:20070301T110000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+END:VCALENDAR
+
--- kcal/KOrganizer_3.1.ics.ical.ref	(revision 0)
+++ kcal/KOrganizer_3.1.ics.ical.ref	(revision 894879)
@@ -0,0 +1,255 @@
+BEGIN:VCALENDAR
+PRODID:-//K Desktop Environment//NONSGML libkcal 3.5//EN
+VERSION:2.0
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212250Z
+UID:KOrganizer-1744115041.851
+SEQUENCE:2
+LAST-MODIFIED:20031213T212259Z
+DESCRIPTION:Two day all-day event.\n
+SUMMARY:All Day 2
+PRIORITY:5
+DTSTART;VALUE=DATE:20031209
+DTEND;VALUE=DATE:20031211
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212311Z
+UID:KOrganizer-1927781860.81
+SEQUENCE:2
+LAST-MODIFIED:20031213T212315Z
+DESCRIPTION:Three day all-day event.\n
+SUMMARY:All day 3
+PRIORITY:5
+DTSTART;VALUE=DATE:20031210
+DTEND;VALUE=DATE:20031213
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+ATTENDEE;CN="Another Name";RSVP=TRUE;PARTSTAT=ACCEPTED;
+ ROLE=NON-PARTICIPANT:mailto:two@yyy.yy
+ATTENDEE;CN="One Name";RSVP=FALSE;PARTSTAT=NEEDS-ACTION;
+ ROLE=REQ-PARTICIPANT:mailto:one@xxx.xx
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212528Z
+UID:KOrganizer-2056335629.565
+SEQUENCE:1
+LAST-MODIFIED:20031213T212636Z
+DESCRIPTION:Reminder 13 minutes\nShow time as free\nCategory Special 
+ Occasion\nAccess Private\nTwo attendees.\nAlert.wav sound alarm\n
+SUMMARY:Full Information Event
+LOCATION:This is a location
+CLASS:PRIVATE
+PRIORITY:5
+CATEGORIES:Special Occasion
+DTSTART:20031211T133000Z
+DTEND:20031211T154500Z
+TRANSP:OPAQUE
+BEGIN:VALARM
+ATTACH:/usr/share/apps/korganizer/sounds/alert.wav
+ACTION:AUDIO
+TRIGGER;VALUE=DURATION:-PT13M
+END:VALARM
+
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T213054Z
+UID:KOrganizer-1149443407.784
+SEQUENCE:1
+LAST-MODIFIED:20031213T213109Z
+DESCRIPTION:12.12. 17:15 to 13.12. 19:15\n1 hour alarm
+SUMMARY:Multi-Day Event with Start/End Time
+PRIORITY:5
+DTSTART:20031212T171500Z
+DTEND:20031213T191500Z
+TRANSP:OPAQUE
+BEGIN:VALARM
+DESCRIPTION:
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION:-PT1H
+END:VALARM
+
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212219Z
+UID:KOrganizer-182017314.321
+SEQUENCE:2
+LAST-MODIFIED:20031213T212229Z
+DESCRIPTION:One day all-day event.\nCategories Birthday\, Personal\n
+SUMMARY:All Day
+PRIORITY:5
+CATEGORIES:Birthday
+CATEGORIES:Personal
+DTSTART;VALUE=DATE:20031212
+DTEND;VALUE=DATE:20031213
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212707Z
+UID:KOrganizer-1025455571.504
+SEQUENCE:1
+LAST-MODIFIED:20031213T212727Z
+DESCRIPTION:Recurring weekly three times on wednesday
+SUMMARY:Recurring weekly
+PRIORITY:5
+RRULE:FREQ=WEEKLY;COUNT=3;BYDAY=WE
+DTSTART:20031210T073000Z
+DTEND:20031210T083000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T213318Z
+UID:KOrganizer-951116794.484
+LAST-MODIFIED:20031213T213318Z
+DESCRIPTION:Recurring until 10.12.\nException 9.12.\n
+SUMMARY:Recurring with exception
+PRIORITY:5
+RRULE:FREQ=DAILY;UNTIL=20031210
+EXDATE;VALUE=DATE:20031209
+DTSTART:20031208T163000Z
+DTEND:20031208T184500Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T162226Z
+UID:KOrganizer-406380218.717
+SEQUENCE:1
+LAST-MODIFIED:20031213T212040Z
+DESCRIPTION:10:00 - 13:30 (UTC)\n
+SUMMARY:An Event
+PRIORITY:5
+DTSTART:20031213T100000Z
+DTEND:20031213T133000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212117Z
+UID:KOrganizer-856020879.491
+LAST-MODIFIED:20031213T212117Z
+DESCRIPTION:9:30 - 11:15 (UTC)\nRecurring twice
+SUMMARY:Another Event
+PRIORITY:5
+RRULE:FREQ=DAILY;COUNT=2
+DTSTART:20031209T093000Z
+DTEND:20031209T111500Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212933Z
+UID:KOrganizer-475330509.201
+LAST-MODIFIED:20031213T212933Z
+DESCRIPTION:See Week 50 2003 for more events.\nRecur daily forever.\n
+SUMMARY:NAVIGATION EVENT
+PRIORITY:5
+RRULE:FREQ=DAILY
+DTSTART:20031208T120000Z
+DTEND:20031208T130000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T212804Z
+UID:KOrganizer-465691683.1018
+LAST-MODIFIED:20031213T212804Z
+SUMMARY:Recurring monthly until 1.1.2005
+PRIORITY:5
+RRULE:FREQ=MONTHLY;UNTIL=20050101;BYMONTHDAY=11
+DTSTART:20031211T084500Z
+DTEND:20031211T103000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T213154Z
+UID:KOrganizer-1952016504.437
+SEQUENCE:1
+LAST-MODIFIED:20031213T213204Z
+SUMMARY:Birthday
+PRIORITY:5
+CATEGORIES:Birthday
+RRULE:FREQ=YEARLY;BYMONTH=12
+DTSTART;VALUE=DATE:20031208
+DTEND;VALUE=DATE:20031209
+TRANSP:OPAQUE
+BEGIN:VALARM
+DESCRIPTION:
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION:-P1D
+END:VALARM
+
+END:VEVENT
+
+BEGIN:VEVENT
+DTSTAMP:20040122T092700Z
+ORGANIZER:MAILTO:nobody@nowhere
+X-PILOTID:0
+X-PILOTSTAT:1
+CREATED:20031213T213357Z
+UID:KOrganizer-659286401.509
+SEQUENCE:1
+LAST-MODIFIED:20031213T213426Z
+SUMMARY:Recurring three times two days interval
+PRIORITY:5
+RRULE:FREQ=DAILY;COUNT=3;INTERVAL=2
+DTSTART:20031208T194500Z
+DTEND:20031208T213000Z
+TRANSP:OPAQUE
+END:VEVENT
+
+END:VCALENDAR

Property changes on: kcal/tests/data/Compat/eGroupware.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: kcal/tests/data/Compat/MSExchange.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: kcal/tests/data/Compat/KOrganizer_3.1.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: kcal/tests/data/Compat/KOrganizer_3.2.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kcal/MSExchange.ics.ical.ref
===================================================================

Property changes on: kcal/MSExchange.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kcal/KOrganizer_3.2.ics.ical.ref
===================================================================

Property changes on: kcal/KOrganizer_3.2.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kcal/icalformat_p.cpp
===================================================================
Index: kcal/eGroupware.ics.ical.ref
===================================================================

Property changes on: kcal/eGroupware.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kcal/KOrganizer_3.1.ics.ical.ref
===================================================================

Property changes on: kcal/KOrganizer_3.1.ics.ical.ref
___________________________________________________________________
Added: svn:eol-style
   + native