cvs: pear /DB_ldap2 ldap2.php ldap3.php package.xml

dexter Tue Sep 30 07:09:40 2003 EDT Modified files: /pear/DB_ldap2 ldap2.php ldap3.php package.xml Log: allow connect to other port than 389 Index: pear/DB_ldap2/ldap2.php diff -u pear/DB_ldap2/ldap2.php:1.4 pear/DB_ldap2/ldap2.php:1.5 --- pear/DB_ldap2/ldap2.php:1.4 Fri Sep 19 10:08:10 2003 +++ pear/DB_ldap2/ldap2.php Tue Sep 30 07:09:40 2003 @@ -22,7 +22,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: ldap2.php,v 1.4 2003/09/19 14:08:10 cain Exp $ +// $Id: ldap2.php,v 1.5 2003/09/30 11:09:40 dexter Exp $ // require_once 'DB/common.php'; @@ -34,7 +34,7 @@ * access to LDAP servers with protocol version 2. * * @author Piotr Roszatycki <dexter@debian.org> - * @version $Revision: 1.4 $ + * @version $Revision: 1.5 $ * @package DB_ldap2 */ @@ -181,6 +181,7 @@ $user = $dsninfo['username']; $pw = $dsninfo['password']; $host = $dsninfo['hostspec']; + $port = empty($dsninfo['port']) ? 389 : $dsninfo['port']; $this->param = array( 'action' => 'search', @@ -202,7 +203,7 @@ $this->fetchmode = DB_FETCHMODE_ASSOC; if ($host) { - $conn = @ldap_connect($host); + $conn = @ldap_connect($host, $port); } else { return $this->raiseError("unknown host $host"); } Index: pear/DB_ldap2/ldap3.php diff -u pear/DB_ldap2/ldap3.php:1.2 pear/DB_ldap2/ldap3.php:1.3 --- pear/DB_ldap2/ldap3.php:1.2 Fri Sep 19 10:03:52 2003 +++ pear/DB_ldap2/ldap3.php Tue Sep 30 07:09:40 2003 @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// $Id: ldap3.php,v 1.2 2003/09/19 14:03:52 cain Exp $ +// $Id: ldap3.php,v 1.3 2003/09/30 11:09:40 dexter Exp $ // require_once 'DB/common.php'; @@ -32,7 +32,7 @@ * access to LDAP servers with protocol version 3. * * @author Piotr Roszatycki <dexter@debian.org> - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * @package DB_ldap3 */ @@ -67,6 +67,7 @@ $user = $dsninfo['username']; $pw = $dsninfo['password']; $host = $dsninfo['hostspec']; + $port = empty($dsninfo['port']) ? 389 : $dsninfo['port']; $this->param = array( 'action' => 'search', @@ -88,7 +89,7 @@ $this->fetchmode = DB_FETCHMODE_ASSOC; if ($host) { - $conn = @ldap_connect($host); + $conn = @ldap_connect($host, $port); } else { return $this->raiseError("unknown host $host"); } Index: pear/DB_ldap2/package.xml diff -u pear/DB_ldap2/package.xml:1.6 pear/DB_ldap2/package.xml:1.7 --- pear/DB_ldap2/package.xml:1.6 Mon Sep 22 16:18:16 2003 +++ pear/DB_ldap2/package.xml Tue Sep 30 07:09:40 2003 @@ -19,12 +19,11 @@ </maintainers> <license>LGPL</license> <release> - <version>0.3</version> - <date>2003-09-22</date> + <version>0.4</version> + <date>2003-09-30</date> <state>beta</state> <notes> -* mainly resolved CS issues -* added sort parameter to simpleQuery() +* allow connect to other port than 389 </notes> <filelist> <dir name="/" role="php" baseinstalldir="DB"> @@ -86,6 +85,15 @@ </deps> </release> <changelog> + <release> + <version>0.3</version> + <date>2003-09-22</date> + <state>beta</state> + <notes> +* mainly resolved CS issues +* added sort parameter to simpleQuery() +</notes> + </release> <release> <version>0.2</version>