[292] in BarnOwl Developers
[D-O-H] r449 - in trunk/owl/perl/lib: Net/XMPP XML
daemon@ATHENA.MIT.EDU (asedeno@MIT.EDU)
Thu Oct 29 18:04:34 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: asedeno@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Thu, 2 Nov 2006 22:56:15 -0500 (EST)
Author: asedeno
Date: 2006-11-02 22:56:15 -0500 (Thu, 02 Nov 2006)
New Revision: 449
Modified:
trunk/owl/perl/lib/Net/XMPP/Roster.pm
trunk/owl/perl/lib/XML/Stream.pm
Log:
Stream.pm: Proper call to SASL.
Roster.pm: Removing print statements.
Modified: trunk/owl/perl/lib/Net/XMPP/Roster.pm
===================================================================
--- trunk/owl/perl/lib/Net/XMPP/Roster.pm 2006-11-03 03:52:43 UTC (rev 448)
+++ trunk/owl/perl/lib/Net/XMPP/Roster.pm 2006-11-03 03:56:15 UTC (rev 449)
@@ -423,8 +423,6 @@
my $self = shift;
my $iq = shift;
- print "handleIQ: iq(",$iq->GetXML(),")\n";
-
my $type = $iq->GetType();
return unless (($type eq "set") || ($type eq "result"));
@@ -461,8 +459,6 @@
my $self = shift;
my $presence = shift;
- print "handlePresence: presence(",$presence->GetXML(),")\n";
-
my $type = $presence->GetType();
$type = "" unless defined($type);
return unless (($type eq "") ||
Modified: trunk/owl/perl/lib/XML/Stream.pm
===================================================================
--- trunk/owl/perl/lib/XML/Stream.pm 2006-11-03 03:52:43 UTC (rev 448)
+++ trunk/owl/perl/lib/XML/Stream.pm 2006-11-03 03:56:15 UTC (rev 449)
@@ -2113,14 +2113,13 @@
my $sasl = new Authen::SASL(mechanism=>join(" ",@{$mechanisms}),
callback=>{
- authname => $username."@".$self->{SIDS}->{$sid}->{hostname},
-
+# authname => $username."@".$self->{SIDS}->{$sid}->{hostname},
user => $username,
pass => $password
}
);
- $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new();
+ $self->{SIDS}->{$sid}->{sasl}->{client} = $sasl->client_new('xmpp', $self->{SIDS}->{$sid}->{hostname});
$self->{SIDS}->{$sid}->{sasl}->{username} = $username;
$self->{SIDS}->{$sid}->{sasl}->{password} = $password;
$self->{SIDS}->{$sid}->{sasl}->{authed} = 0;
