[369] in BarnOwl Developers
[D-O-H] r511 - in trunk: . owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:05:25 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Tue, 9 Jan 2007 23:33:42 -0500 (EST)
Author: nelhage
Date: 2007-01-09 23:33:42 -0500 (Tue, 09 Jan 2007)
New Revision: 511
Modified:
trunk/
trunk/owl/perl/modules/jabber.pl
Log:
r17901@phanatique: nelhage | 2007-01-09 15:48:56 -0500
This is slightly cleaner than checking $#result.
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17900
+ bb873fd7-8e23-0410-944a-99ec44c633eb:/branches/owl/filter-rewrite:15925
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h/trunk:17901
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2007-01-10 04:33:23 UTC (rev 510)
+++ trunk/owl/perl/modules/jabber.pl 2007-01-10 04:33:42 UTC (rev 511)
@@ -351,8 +351,8 @@
} else {
my @result = $client->AuthSend( %{ $vars{jlogin_authhash} } );
- if ( ($result[0] || "") ne 'ok' ) {
- if ( !$vars{jlogin_havepass} && $result[0] eq '401' ) {
+ if ( !@result || $result[0] ne 'ok' ) {
+ if ( !$vars{jlogin_havepass} && ( $#result == -1 || $result[0] eq '401' ) ) {
$vars{jlogin_havepass} = 1;
$conn->removeConnection($jidStr);
owl::start_password( "Password for $jidStr: ", \&do_login );
