svnno****@sourc*****
svnno****@sourc*****
2007年 10月 26日 (金) 15:03:36 JST
SRADRevision: 230
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=230
Author: tach
Date: 2007-10-26 15:03:35 +0900 (Fri, 26 Oct 2007)
Log Message:
-----------
Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level"
Modified Paths:
--------------
slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm
slashjp/trunk/debian/changelog
slashjp/trunk/sql/mysql/defaults.sql
-------------- next part --------------
Modified: slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm
===================================================================
--- slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-25 11:46:58 UTC (rev 229)
+++ slashjp/trunk/Slash/LDAPDB/lib/Slash/LDAPDB.pm 2007-10-26 06:03:35 UTC (rev 230)
@@ -55,6 +55,8 @@
@_ };
bless $self, $class;
+ $DEBUG_LEVEL = $constants->{ldap_debug_level} || $DEBUG_LEVEL;
+
if (!$self->{_disabled} &&
!($self->{_ldap} = Net::LDAP->new($self->{host}, timeout => $self->{timeout}))){
__debug(1, "LDAP: can't create LDAP object $@");
Modified: slashjp/trunk/debian/changelog
===================================================================
--- slashjp/trunk/debian/changelog 2007-10-25 11:46:58 UTC (rev 229)
+++ slashjp/trunk/debian/changelog 2007-10-26 06:03:35 UTC (rev 230)
@@ -14,8 +14,9 @@
fixparam() in Slash/Utility/Data/Data.pm
* Fix warning: Use of uninitialized value and hash key at
templateEdit() in plugins/Admin/admin.pl
+ * Allow to change LDAPDB DEBUG_LEVEL using vars "ldap_debug_level"
- -- Taku YASUI <tach****@osdn*****> Thu, 25 Oct 2007 20:45:36 +0900
+ -- Taku YASUI <tach****@osdn*****> Fri, 26 Oct 2007 15:01:29 +0900
slash (2.5.0.119-17) unstable; urgency=low
Modified: slashjp/trunk/sql/mysql/defaults.sql
===================================================================
--- slashjp/trunk/sql/mysql/defaults.sql 2007-10-25 11:46:58 UTC (rev 229)
+++ slashjp/trunk/sql/mysql/defaults.sql 2007-10-26 06:03:35 UTC (rev 230)
@@ -1119,6 +1119,7 @@
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_base_dn','','base dn for LDAP migration');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_dn','','binddn for LDAP migration');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_bind_passwd','','bind password for LDAP migration');
+INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_debug_level','0','LDAPDB debug level (default: 5)');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_enable','0','enable LDAP migration (1: enable, 0: disable)');
INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_peer_attrib_prefix', '', 'peer attribute prefix for LDAP migration');
INSERT IGNORE INTO vars (name, value, description) VALUES ('mail_charset_body','us-ascii','Character Encoding used for mail body sent by the system (s. Encode::Supported)');