[eGroupWare-svn] r24217 - /trunk/phpgwapi/inc/class.accounts_ldap.inc.php

[<ral...@us...>]

Author: ralfbecker
Date: Wed Jun 27 07:26:46 2007
New Revision: 24217

URL: http://www.egroupware.org/viewvc?rev=3D3D24217&view=3D3Drev
Log:
"fixed bug reported from sim <sim-at-compulab.co.il>: _read_group not searc=
=3D
hing for posixGroup, which makes problems if you have identical numbers and=
=3D
 context for users and groups
also added a filter for objectclass=3D3DposixAccount to _read_user"

Modified:
    trunk/phpgwapi/inc/class.accounts_ldap.inc.php

Modified: trunk/phpgwapi/inc/class.accounts_ldap.inc.php
URL: http://www.egroupware.org/viewvc/trunk/phpgwapi/inc/class.accounts_lda=
=3D
p=2Einc.php?rev=3D3D24217&r1=3D3D24216&r2=3D3D24217&view=3D3Ddiff
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=
=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D3D=3D
=3D3D=3D3D=3D3D
--- trunk/phpgwapi/inc/class.accounts_ldap.inc.php (original)
+++ trunk/phpgwapi/inc/class.accounts_ldap.inc.php Wed Jun 27 07:26:46 2007
@@ -399,7 +399,7 @@
 	 */
 	function _read_group($account_id)
 	{
-		$sri =3D3D ldap_search($this->ds, $this->group_context, 'gidnumber=3D3D'=
 =2E a=3D
bs($account_id),
+		$sri =3D3D ldap_search($this->ds, $this->group_context,'(&(objectClass=
=3D3Dp=3D
osixGroup)(gidnumber=3D3D' . abs($account_id).'))',
 			array('dn','gidnumber','cn','objectclass','mail'));
 		=3D

 		$data =3D3D ldap_get_entries($this->ds, $sri);
@@ -443,7 +443,7 @@
 	 */
 	function _read_user($account_id)
 	{
-		$sri =3D3D ldap_search($this->ds, $this->user_context, 'uidnumber=3D3D' =
. (i=3D
nt)$account_id,
+		$sri =3D3D ldap_search($this->ds, $this->user_context, '(&(objectclass=
=3D3Dp=3D
osixAccount)(uidnumber=3D3D' . (int)$account_id.'))',
 			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn','mail','=
=3D
userpassword',
 			'shadowexpire','shadowlastchange','homedirectory','loginshell'));
 		=3D