スラド

[Slashdotjp-dev 1222] [750] remove LDAPDB

svnno****@sourc***** svnno****@sourc*****
2008年 9月 17日 (水) 12:31:18 JST

• 前の記事 [Slashdotjp-dev 1221] [749] Add feature to store/get polls RSS content from memcached
• 次の記事 [Slashdotjp-dev 1223] [751] fix debian version
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 750
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=slashdotjp&view=rev&rev=750
Author:   tach
Date:     2008-09-17 12:31:18 +0900 (Wed, 17 Sep 2008)

Log Message:
-----------
remove LDAPDB

Modified Paths:
--------------
    slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
    slashjp/branches/2.5.0.192/debian/changelog
    slashjp/branches/2.5.0.192/debian/control
    slashjp/branches/2.5.0.192/plugins/Login/login.pl
    slashjp/branches/2.5.0.192/sql/mysql/defaults.sql

Removed Paths:
-------------
    slashjp/branches/2.5.0.192/Slash/LDAPDB/


-------------- next part --------------
Modified: slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm
===================================================================
--- slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm	2008-09-17 03:04:47 UTC (rev 749)
+++ slashjp/branches/2.5.0.192/Slash/DB/MySQL/MySQL.pm	2008-09-17 03:31:18 UTC (rev 750)
@@ -20,7 +20,6 @@
 use base 'Slash::DB::Utility';
 use Slash::Constants ':messages';
 use Encode;
-use Slash::LDAPDB;
 
 ($VERSION) = ' $Revision$ ' =~ /\$Revision:\s+([^\s]+)/;
 
@@ -1567,7 +1566,6 @@
 	});
 	my $rows = $self->sqlDelete("users_param", "uid=$uid");
 	$self->setUser_delete_memcached($uid);
-	#Slash::LDAPDB->new()->deleteUserByUid($uid); # do NOT delete entry. just remove site data...
 	return $rows;
 }
 
@@ -1645,7 +1643,6 @@
 					passwd		=> $cryptpasswd
 				}, "uid=$uid_try_q");
 				$newpass = 1;
-				Slash::LDAPDB->new()->setUserByUid($uid_try, {passwd => $cryptpasswd});
 
 				$uid_verified = $db_uid;
 				# delete existing logtokens
@@ -2481,13 +2478,6 @@
 	$self->sqlDo("COMMIT");
 	$self->sqlDo("SET AUTOCOMMIT=1");
 
-	Slash::LDAPDB->new()->createUser($matchname, {
-		realemail	=> $email,
-		nickname	=> $newuser,
-		passwd		=> $passwd,
-		uid		=> $uid,
-	});
-
 	$self->setUser_delete_memcached($uid);
 
 	return $uid;
@@ -10538,8 +10528,6 @@
 	$mcd_need_delete = 1 if $rows;
 	$self->setUser_delete_memcached($uid) if $mcd_need_delete;
 
-	Slash::LDAPDB->new()->setUserByUid($uid, $hashref);
-
 	return $rows;
 }
 

Modified: slashjp/branches/2.5.0.192/debian/changelog
===================================================================
--- slashjp/branches/2.5.0.192/debian/changelog	2008-09-17 03:04:47 UTC (rev 749)
+++ slashjp/branches/2.5.0.192/debian/changelog	2008-09-17 03:31:18 UTC (rev 750)
@@ -6,7 +6,6 @@
     - you can access old URL
   * Add /faq/ internal redirection at Slash/Apache/Apache.pm
     - This code is for slash-plugin-wikicontents
-  * Fix LDAP.pm DEBUG_LEVEL warning
   * Use $user->{currentSkin} at $slashdb->getTemplateByName()
     - Fix: slashDisplay() option 'Skin' does not applied
   * Add logcheck ignore rule for SearchEst
@@ -15,8 +14,9 @@
   * Redirect to new journal RSS URL
   * Add feature storing RSS output into memcached
   * Add feature to store/get journal and polls RSS content from memcached
+  * Remove LDAPDB library
 
- -- Taku YASUI <tach****@osdn*****>  Wed, 17 Sep 2008 03:04:03 +0000
+ -- Taku YASUI <tach****@osdn*****>  Wed, 17 Sep 2008 03:15:14 +0000
 
 slash (2.5.0.192-16) unstable; urgency=low
 

Modified: slashjp/branches/2.5.0.192/debian/control
===================================================================
--- slashjp/branches/2.5.0.192/debian/control	2008-09-17 03:04:47 UTC (rev 749)
+++ slashjp/branches/2.5.0.192/debian/control	2008-09-17 03:31:18 UTC (rev 750)
@@ -8,7 +8,7 @@
 
 Package: slash-common
 Architecture: any
-Depends: libcompress-zlib-perl, libxml-parser-perl, libdbix-password-perl (>= 1.8-5), libnet-perl, libtimedate-perl, libapache-dbilogger-perl, libhtml-parser-perl, libhtml-format-perl, libxml-rss-perl, libimage-size-perl, libemail-valid-perl, libtemplate-perl, libmail-sendmail-perl, libsoap-lite-perl, liblingua-stem-perl, libhtml-template-perl, libmime-types-perl, libparallel-useragent-perl, libhtml-popuptreeselect-perl, libnet-ldap-perl, libjcode-pm-perl, libhtml-calendarmonth-perl, libgd-gd2-perl, libgd-text-perl, libdata-javascript-anon-perl, libdate-calc-perl, libfile-type-perl, libfinance-quote-perl, ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+Depends: libcompress-zlib-perl, libxml-parser-perl, libdbix-password-perl (>= 1.8-5), libnet-perl, libtimedate-perl, libapache-dbilogger-perl, libhtml-parser-perl, libhtml-format-perl, libxml-rss-perl, libimage-size-perl, libemail-valid-perl, libtemplate-perl, libmail-sendmail-perl, libsoap-lite-perl, liblingua-stem-perl, libhtml-template-perl, libmime-types-perl, libparallel-useragent-perl, libhtml-popuptreeselect-perl, libjcode-pm-perl, libhtml-calendarmonth-perl, libgd-gd2-perl, libgd-text-perl, libdata-javascript-anon-perl, libdate-calc-perl, libfile-type-perl, libfinance-quote-perl, ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
 Suggests: libtimedate-perl-ja
 Description: The code that runs Slashdot - common files
  Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture

Modified: slashjp/branches/2.5.0.192/plugins/Login/login.pl
===================================================================
--- slashjp/branches/2.5.0.192/plugins/Login/login.pl	2008-09-17 03:04:47 UTC (rev 749)
+++ slashjp/branches/2.5.0.192/plugins/Login/login.pl	2008-09-17 03:31:18 UTC (rev 750)
@@ -10,7 +10,6 @@
 use Slash::Display;
 use Slash::Utility;
 use Slash::XML;
-use Slash::LDAPDB;
 
 use vars qw($VERSION);
 
@@ -78,7 +77,6 @@
 	my @note;
 	my $error = 0;
 
-	my $ldap = Slash::LDAPDB->new(attrib_prefix => getCurrentStatic->{ldap_peer_attrib_prefix});
 	# check if new nick is OK and if user exists
 	my $newnick = nickFix($form->{newusernick});
 	my $matchname = nick2matchname($newnick);
@@ -97,22 +95,6 @@
 	} elsif ($slashdb->existsEmail($form->{email})) {
 		push @note, getData('email_exists');
 		$error = 1;
-	} elsif ($constants->{ldap_enable} && (!defined($ldap) || !$ldap->bind())) {
-		push @note, getData('ldap_conn_fail');
-		$error = 1;
-	} elsif ($constants->{ldap_enable} && $ldap->getUser($matchname)
-	       		&& (!defined($form->{peerpasswd}) || $form->{peerpasswd} eq "")) {
-		push @note, getData('duplicate_user', { 
-			nick => $form->{newusernick},
-		});
-		$error = 1;
-	} elsif ($constants->{ldap_enable}
-	       		&& defined($form->{peerpasswd})
-			&& $form->{peerpasswd} ne ""
-			&& $ldap->getUser($matchname)
-		       	&& !$ldap->authUser($matchname, $form->{peerpasswd})) {
-		push @note, getData('ldap_peer_pass_fail');
-		$error = 1;
 	} elsif ($matchname ne '' && $newnick ne '') {
 		if ($constants->{newuser_portscan}) {
 			my $is_trusted = $slashdb->checkAL2($user->{srcids}, 'trusted');

Modified: slashjp/branches/2.5.0.192/sql/mysql/defaults.sql
===================================================================
--- slashjp/branches/2.5.0.192/sql/mysql/defaults.sql	2008-09-17 03:04:47 UTC (rev 749)
+++ slashjp/branches/2.5.0.192/sql/mysql/defaults.sql	2008-09-17 03:31:18 UTC (rev 750)
@@ -1119,13 +1119,6 @@
 INSERT INTO vars (name, value, description) VALUES ('xhtml','0','Boolean for whether we are using XHTML');
 
 -- add constants for OSDN Japan
-INSERT IGNORE INTO vars (name, value, description) VALUES ('ldap_attrib_prefix','','attribute prefix for LDAP migration');
-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)');
 INSERT IGNORE INTO vars (name, value, description) VALUES ('mail_charset_header','MIME-Header','Character Encoding used for mail header sent by the system (s. Encode::MIME::Header)');
 INSERT IGNORE INTO vars (name, value, description) VALUES ('rss_entitize_nonascii', 1, 'Convert non-ASCII-printable characters into entities?');

• 前の記事 [Slashdotjp-dev 1221] [749] Add feature to store/get polls RSS content from memcached
• 次の記事 [Slashdotjp-dev 1223] [751] fix debian version
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]