martin: server/kolab-webadmin/kolab-webadmin/php/admin/include ldap.class.php, 1.11, 1.12
cvs at intevation.de
cvs at intevation.de
Thu Aug 12 04:20:08 CEST 2004
Author: martin
Update of /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include
In directory doto:/tmp/cvs-serv8374/kolab-webadmin/kolab-webadmin/php/admin/include
Modified Files:
ldap.class.php
Log Message:
Martin K.: Fix for issue 288 (Possible to create two users with the same UID)
Index: ldap.class.php
===================================================================
RCS file: /kolabrepository/server/kolab-webadmin/kolab-webadmin/php/admin/include/ldap.class.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ldap.class.php 4 Aug 2004 00:48:42 -0000 1.11
+++ ldap.class.php 12 Aug 2004 02:20:05 -0000 1.12
@@ -263,7 +263,11 @@
// This can be used to check for uniqueness etc.
function countMail( $base, $mail , $excludedn=false ) {
// First count users
- $filter = '(|(mail='.$this->escape($mail).')(alias='.$this->escape($mail).'))';
+ $filter = '(|(|(mail='.$this->escape($mail).')
+ (alias='.$this->escape($mail).')
+ )
+ (uid='.$this->escape($mail).')
+ )';
$res = $this->search( $base, $filter, array( 'dn' ) );
$count = 0;
More information about the commits
mailing list