You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by mm...@apache.org on 2014/12/05 16:23:15 UTC
svn commit: r1643325 -
/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
Author: mmartinec
Date: Fri Dec 5 15:23:15 2014
New Revision: 1643325
URL: http://svn.apache.org/r1643325
Log:
Bug 7030: BayesStore/Redis.pm: authentication doesn't work with Redis 2.6 and earlier
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm?rev=1643325&r1=1643324&r2=1643325&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/BayesStore/Redis.pm Fri Dec 5 15:23:15 2014
@@ -227,13 +227,13 @@ sub on_connect {
eval {
$r->call('SELECT', $db_id) eq 'OK' ? 1 : 0;
} or do {
- if ($@ =~ /\bNOAUTH\b/) {
+ if ($@ =~ /^NOAUTH\b/ || $@ =~ /^ERR operation not permitted/) {
defined $pwd
or die "Redis server requires authentication, no password provided";
$r->call('AUTH', $pwd);
$r->call('SELECT', $db_id);
} else {
- chomp $@; die "Redis error: $@";
+ chomp $@; die "Command 'SELECT $db_id' failed: $@";
}
};
eval {