koozali
/
ipasserelle-im
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DisplayName in LDAP Roster

This commit is contained in:
Daniel Berteaud 2012-03-30 10:49:57 +02:00
parent af6fdb290f
commit 0841925c8e
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ipasserelle-im.spec
View File

@ -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

13
root/etc/e-smith/templates/etc/ejabberd/ejabberd.cfg/86ModuleSharedRosterLDAP
View File

@ -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"}
]}