CVS update: php31/ext/ldap
| From: | rasmus | Date: | Sat, 19 Sep 1998 16:50:25 +0000 |
| Subject: | CVS update: php31/ext/ldap | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-1257@lists.php.net to get a copy of this message | ||
Date: Saturday September 19, 1998 @ 12:50
Author: rasmus
Update of /repository/php31/ext/ldap
In directory asf:/u2/tmp/cvs-serv9915/ext/ldap
Modified Files:
ldap.c
Log Message:
Bring SNMP and LDAP modules up to date
Index: php31/ext/ldap/ldap.c
diff -c php31/ext/ldap/ldap.c:2.7 php31/ext/ldap/ldap.c:2.8
*** php31/ext/ldap/ldap.c:2.7 Wed Sep 16 15:15:18 1998
--- php31/ext/ldap/ldap.c Sat Sep 19 12:50:24 1998
***************
*** 29,35 ****
*/
! /* $Id: ldap.c,v 2.7 1998/09/16 19:15:18 shane Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
--- 29,35 ----
*/
! /* $Id: ldap.c,v 2.8 1998/09/19 16:50:24 rasmus Exp $ */
#define IS_EXT_MODULE
#if !PHP_31 && defined(THREAD_SAFE)
#undef THREAD_SAFE
***************
*** 252,257 ****
--- 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;
}
***************
*** 259,264 ****
--- 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);
***************
*** 302,308 ****
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.7 1998/09/16
19:15:18 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>"
--- 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.8 1998/09/19
16:50:24 rasmus 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>"
***************
*** 727,733 ****
/* php3_error(E_WARNING, "LDAP: Unable to read the entries from result : %s",
ldap_err2string(ldap->ld_errno));*/
RETURN_FALSE;
} else {
! RETURN_LONG(php3_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result)_entry));
}
}
--- 733,739 ----
/* php3_error(E_WARNING, "LDAP: Unable to read the entries from result : %s",
ldap_err2string(ldap->ld_errno));*/
RETURN_FALSE;
} else {
! RETURN_LONG(php3_list_insert(ldap_result_entry, LDAP_GLOBAL(le_result_entry)));
}
}
***************
*** 754,760 ****
RETURN_FALSE;
} else {
/* php3_list_delete(result->value.lval); */
! RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result)_entry));
}
}
--- 760,766 ----
RETURN_FALSE;
} else {
/* php3_list_delete(result->value.lval); */
! RETURN_LONG(php3_list_insert(ldap_result_entry_next, LDAP_GLOBAL(le_result_entry)));
}
}
--
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