[svn:qpsmtpd] r607 - in trunk: lib/Qpsmtpd plugins/auth

[jpeacock]

Author: jpeacock
Date: Fri Jan 27 09:16:13 2006
New Revision: 607

Modified:
   trunk/lib/Qpsmtpd/PollServer.pm
   trunk/lib/Qpsmtpd/SMTP.pm
   trunk/plugins/auth/auth_vpopmail_sql
Log:
Oops, forgot to remove all traces of Qmsptmd::Auth while I was at it.
Also made auth_vpopmail_sql be quieter about problems authenticating.

Modified: trunk/lib/Qpsmtpd/PollServer.pm
==============================================================================
--- trunk/lib/Qpsmtpd/PollServer.pm     (original)
+++ trunk/lib/Qpsmtpd/PollServer.pm     Fri Jan 27 09:16:13 2006
@@ -28,7 +28,6 @@ use fields qw(
     _continuation
 );
 use Qpsmtpd::Constants;
-use Qpsmtpd::Auth;
 use Qpsmtpd::Address;
 use Danga::DNS;
 use Mail::Header;

Modified: trunk/lib/Qpsmtpd/SMTP.pm
==============================================================================
--- trunk/lib/Qpsmtpd/SMTP.pm   (original)
+++ trunk/lib/Qpsmtpd/SMTP.pm   Fri Jan 27 09:16:13 2006
@@ -8,7 +8,6 @@ use Carp;
 
 use Qpsmtpd::Plugin;
 use Qpsmtpd::Constants;
-use Qpsmtpd::Auth;
 use Qpsmtpd::Address ();
 
 use Mail::Header ();

Modified: trunk/plugins/auth/auth_vpopmail_sql
==============================================================================
--- trunk/plugins/auth/auth_vpopmail_sql        (original)
+++ trunk/plugins/auth/auth_vpopmail_sql        Fri Jan 27 09:16:13 2006
@@ -67,8 +67,9 @@ sub authsql {
     my $dbuser   = "vpopmailuser";
     my $dbpasswd = "**********";
 
-    my $dbh = DBI->connect( $connect, $dbuser, $dbpasswd );
-    $dbh->{ShowErrorStatement} = 1;
+    my $dbh = DBI->connect( $connect, $dbuser, $dbpasswd, 
+       { PrintError => 0, } )
+       or return DECLINED;
 
     my ( $self, $transaction, $method, $user, $passClear, $passHash, $ticket ) 
=
       @_;