From 7166f5a597035e376517a27c56579ff0ae0ae985 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed, 25 Sep 2013 16:02:13 -0400
Subject: [PATCH] Fix for bug #2399

---
 .../Appointments/SOGoAppointmentFolder.m      | 31 ++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m
index 395133ac8..03cbb118b 100644
--- a/SoObjects/Appointments/SOGoAppointmentFolder.m
+++ b/SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -2236,10 +2236,39 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return @"";
 }
 
+/*
+  RFC5842 states:
+
+  3.1.  DAV:resource-id Property
+
+   The DAV:resource-id property is a REQUIRED property that enables
+   clients to determine whether two bindings are to the same resource.
+   The value of DAV:resource-id is a URI, and may use any registered URI
+   scheme that guarantees the uniqueness of the value across all
+   resources for all time (e.g., the urn:uuid: URN namespace defined in
+   [RFC4122] or the opaquelocktoken: URI scheme defined in [RFC4918]).
+
+   <!ELEMENT resource-id (href)>
+
+   ...
+
+   so we must STRIP any username prefix, to make the ID global.
+   
+*/
 - (NSString *) davResourceId
 {
+  NSString *name, *prefix;
+
+  prefix = [NSString stringWithFormat: @"%@_", [self ownerInContext: context]];
+  name = [self nameInContainer];
+  
+  if ([name hasPrefix: prefix])
+    {
+      name = [name substringFromIndex: [prefix length]];
+    }
+  
   return [NSString stringWithFormat: @"urn:uuid:%@:calendars:%@",
-                   [self ownerInContext: context], [self nameInContainer]];
+                   [self ownerInContext: context], name];
 }
 
 - (NSArray *) davScheduleCalendarTransparency