From e5500359e68217b18a2be9f2a776d5adda588ae1 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Fri, 30 Mar 2012 10:49:57 +0200
Subject: [PATCH] DisplayName in LDAP Roster

---
 ipasserelle-im.spec                                         |  7 +++++--
 .../etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP      | 13 ++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ipasserelle-im.spec b/ipasserelle-im.spec
index 5464fd8..edf4d41 100644
--- a/ipasserelle-im.spec
+++ b/ipasserelle-im.spec
@@ -1,5 +1,5 @@
-%define version 0.2.0
-%define release 1
+%define version 0.2.1
+%define release 1.beta0
 %define name ipasserelle-im
 
 
@@ -31,6 +31,9 @@ Meta package to configure Instant Messaging features
 on your iPasserelle.
 
 %changelog
+* Fri Mar 30 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.1-1
+- Fix NickNames in LDAP Shared Roster
+
 * Wed Mar 14 2012 Daniel Berteaud <daniel@firewall-services.com> 0.2.0-1
 - Migrate to git
 
diff --git a/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP b/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP
index b788517..bbfcf67 100644
--- a/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP
+++ b/root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP
@@ -3,7 +3,10 @@
 if (($ejabberd{'SharedRoster'} || 'disabled') eq 'enabled'){
 
     my $filter = '';
-    if (scalar(@groups) == 1){
+    if (scalar(@groups) == 0){
+        $filter = "(objectClass=mailboxRelatedObject)";
+    }
+    elsif (scalar(@groups) == 1){
         $filter = "(cn=$groups[0])";
     }
     elsif (scalar(@groups) gt 1){
@@ -15,13 +18,13 @@ if (($ejabberd{'SharedRoster'} || 'disabled') eq 'enabled'){
     $OUT .=<<"HERE";
   ,{mod_shared_roster_ldap, [
     {ldap_base, "$base"},
-    {ldap_rfilter, "(objectClass=mailboxRelatedObject)"},
-    {ldap_filter, "$filter"},
-    {ldap_gfilter, "(&(objectClass=mailboxRelatedObject)(cn=%g))"},
-    {ldap_ufilter, "(&(objectClass=inetOrgPerson)(uid=%u))"},
+    {ldap_rfilter, "$filter"},
+    {ldap_filter, ""},
+    {ldap_ufilter, "(uid=%u)"},
     {ldap_groupattr, "cn"},
     {ldap_groupdesc, "description"},
     {ldap_memberattr, "memberUid"},
+    {ldap_memberattr_format,"%u"},
     {ldap_useruid, "uid"},
     {ldap_userdesc, "cn"}
   ]}