CVS update: php31/ext/ldap
| From: | shane | Date: | Sat, 17 Oct 1998 21:19:13 +0000 |
| Subject: | CVS update: php31/ext/ldap | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1894@lists.php.net to get a copy of this message | ||
Date: Saturday October 17, 1998 @ 17:19
Author: shane
Update of /repository/php31/ext/ldap
In directory asf:/u2/tmp/cvs-serv283/ext/ldap
Modified Files:
ldap.c php3_ldap.h
Log Message:
last misc updates of modules from 3.0 to 3.1
Index: php31/ext/ldap/ldap.c
diff -c php31/ext/ldap/ldap.c:2.10 php31/ext/ldap/ldap.c:2.11
*** php31/ext/ldap/ldap.c:2.10 Wed Sep 30 00:41:51 1998
--- php31/ext/ldap/ldap.c Sat Oct 17 17:19:11 1998
***************
*** 29,35 ****
*/
! /* $Id: ldap.c,v 2.10 1998/09/30 04:41:51 amitay Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
--- 29,35 ----
*/
! /* $Id: ldap.c,v 2.11 1998/10/17 21:19:11 shane Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
***************
*** 52,58 ****
#if COMPILE_DL
#if PHP_31
#include "ext/phpdl.h"
! #include "dl.h"
#else
#include "dl/phpdl.h"
#include "functions/dl.h"
--- 52,58 ----
#if COMPILE_DL
#if PHP_31
#include "ext/phpdl.h"
! #include "ext/standard/dl.h"
#else
#include "dl/phpdl.h"
#include "functions/dl.h"
***************
*** 252,262 ****
}
#endif
#endif
- #if PHP_31
- /* FIXME */
- LDAP_GLOBAL(max_links) = -1;
- LDAP_GLOBAL(base_dn) = NULL;
- #else
if (cfg_get_long("ldap.max_links", &LDAP_GLOBAL(max_links)) == FAILURE) {
LDAP_GLOBAL(max_links) = -1;
}
--- 252,257 ----
***************
*** 264,270 ****
if (cfg_get_string("ldap.base_dn", &LDAP_GLOBAL(base_dn)) == FAILURE) {
LDAP_GLOBAL(base_dn) = NULL;
}
- #endif
LDAP_GLOBAL(le_result) = register_list_destructors(_free_ldap_result, NULL);
LDAP_GLOBAL(le_link) = register_list_destructors(_close_ldap_link, NULL);
--- 259,264 ----
***************
*** 295,301 ****
char maxl[16];
#if HAVE_NSLDAP
LDAPVersion ver;
! double SDKVersion = ldap_version( &ver );
#endif
LDAP_TLS_VARS;
--- 289,297 ----
char maxl[16];
#if HAVE_NSLDAP
LDAPVersion ver;
! double SDKVersion;
! /* Print version information */
! SDKVersion = ldap_version( &ver );
#endif
LDAP_TLS_VARS;
***************
*** 308,314 ****
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 2.10 1998/09/30
04:41:51 amitay Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
--- 304,310 ----
php3_printf("<table>"
"<tr><td>Total links:</td><td>%d/%s</td></tr>\n"
! "<tr><td>RCS Version:</td><td>$Id: ldap.c,v 2.11 1998/10/17
21:19:11 shane Exp $</td></tr>\n"
#if HAVE_NSLDAP
"<tr><td>SDK Version:</td><td>%f</td></tr>"
"<tr><td>Highest LDAP Protocol
Supported:</td><td>%f</td></tr>"
Index: php31/ext/ldap/php3_ldap.h
diff -c php31/ext/ldap/php3_ldap.h:2.4 php31/ext/ldap/php3_ldap.h:2.5
*** php31/ext/ldap/php3_ldap.h:2.4 Wed Sep 30 00:41:51 1998
--- php31/ext/ldap/php3_ldap.h Sat Oct 17 17:19:12 1998
***************
*** 29,35 ****
*/
! /* $Id: php3_ldap.h,v 2.4 1998/09/30 04:41:51 amitay Exp $ */
#ifndef _PHP3_LDAP_H
#define _PHP3_LDAP_H
--- 29,35 ----
*/
! /* $Id: php3_ldap.h,v 2.5 1998/10/17 21:19:12 shane Exp $ */
#ifndef _PHP3_LDAP_H
#define _PHP3_LDAP_H
--
PHP Development Mailing List http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net
For help: php-dev-help@lists.php.net