iliaa Tue Jun 1 17:05:33 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/ldap ldap.c
Log:
MFH: No need to NULL terminate manually, snprintf() does it for us already.
http://cvs.php.net/diff.php/php-src/ext/ldap/ldap.c?r1=1.130.2.9&r2=1.130.2.10&ty=u
Index: php-src/ext/ldap/ldap.c
diff -u php-src/ext/ldap/ldap.c:1.130.2.9 php-src/ext/ldap/ldap.c:1.130.2.10
--- php-src/ext/ldap/ldap.c:1.130.2.9 Mon Oct 6 20:36:27 2003
+++ php-src/ext/ldap/ldap.c Tue Jun 1 17:05:33 2004
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ldap.c,v 1.130.2.9 2003/10/07 00:36:27 iliaa Exp $ */
+/* $Id: ldap.c,v 1.130.2.10 2004/06/01 21:05:33 iliaa Exp $ */
#define IS_EXT_MODULE
#ifdef HAVE_CONFIG_H
@@ -286,19 +286,17 @@
php_info_print_table_start();
php_info_print_table_row(2, "LDAP Support", "enabled" );
- php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.9 2003/10/07
00:36:27 iliaa Exp $" );
+ php_info_print_table_row(2, "RCS Version", "$Id: ldap.c,v 1.130.2.10
2004/06/01 21:05:33 iliaa Exp $" );
if (LDAPG(max_links) == -1) {
snprintf(tmp, 31, "%ld/unlimited", LDAPG(num_links));
} else {
snprintf(tmp, 31, "%ld/%ld", LDAPG(num_links), LDAPG(max_links));
}
- tmp[31] = '\0';
php_info_print_table_row(2, "Total Links", tmp);
#ifdef LDAP_API_VERSION
snprintf(tmp, 31, "%d", LDAP_API_VERSION);
- tmp[31] = '\0';
php_info_print_table_row(2, "API Version", tmp);
#endif
@@ -308,27 +306,22 @@
#ifdef LDAP_VENDOR_VERSION
snprintf(tmp, 31, "%d", LDAP_VENDOR_VERSION);
- tmp[31] = '\0';
php_info_print_table_row(2, "Vendor Version", tmp);
#endif
#if HAVE_NSLDAP
SDKVersion = ldap_version( &ver );
snprintf(tmp, 31, "%f", SDKVersion/100.0 );
- tmp[31] = '\0';
php_info_print_table_row(2, "SDK Version", tmp );
snprintf(tmp, 31, "%f", ver.protocol_version/100.0 );
- tmp[31] = '\0';
php_info_print_table_row(2, "Highest LDAP Protocol Supported", tmp );
snprintf(tmp, 31, "%f", ver.SSL_version/100.0 );
- tmp[31] = '\0';
php_info_print_table_row(2, "SSL Level Supported", tmp );
if ( ver.security_level != LDAP_SECURITY_NONE ) {
snprintf(tmp, 31, "%d", ver.security_level );
- tmp[31] = '\0';
} else {
strcpy(tmp, "SSL not enabled" );
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
