From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 31 Mar 2008 20:43:30 +0000 (+0000)
Subject: git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1397 d1b88da0-ebda-0310... 
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac999b973f297a42450141503c79b99c665e12a1;p=scalable-opengroupware.org

git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1397 d1b88da0-ebda-0310-925b-ed51d893ca5b
---

diff --git a/ChangeLog b/ChangeLog
index 472cfde0..a96d48cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/SOGoUI/SOGoACLAdvisory.m ([SOGoACLAdvisory -resourceName]):
+	use the resource display name instead of its "nameInContainer".
+
 2008-03-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactLDIFEntry.m ([SOGoContactLDIFEntry
diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian
index 07e989aa..b7dfb81a 100755
--- a/Scripts/sogo-init.d-debian
+++ b/Scripts/sogo-init.d-debian
@@ -22,7 +22,9 @@
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-PREFORK=3
+# specify more if you are using a load-balancer
+PREFORK=1
+
 SOGO_ARGS=""
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m
index ecdbb5ff..621950ad 100644
--- a/UI/SOGoUI/SOGoACLAdvisory.m
+++ b/UI/SOGoUI/SOGoACLAdvisory.m
@@ -116,7 +116,7 @@
 
 - (NSString *) resourceName
 {
-  return [aclObject nameInContainer];
+  return [aclObject displayName];
 }
 
 - (NSString *) subject