diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-15 01:25:47 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-15 01:25:47 +0000 |
| commit | 315dd4c1566dcd4caa9c4ca0eceeceb995a01443 (patch) | |
| tree | e9b1d54c4c539bc4b86153f3bedf7bf5149b4a9b /protocols/jabber/io.c | |
| parent | 7e2b5934976f6d833397f72bd11fbc63616a56f2 (diff) | |
Oops.. Today's Jabber fix could get stuck in a somewhat infinite loop if a
Jabber server returns an empty <iq type="result"/> response to the session
establishment request (which is valid and actually done by the example, but
my test Jabberd shows different behaviour). Fixed.
Diffstat (limited to 'protocols/jabber/io.c')
| -rw-r--r-- | protocols/jabber/io.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/protocols/jabber/io.c b/protocols/jabber/io.c index 4a790f27..a14ad21c 100644 --- a/protocols/jabber/io.c +++ b/protocols/jabber/io.c @@ -379,18 +379,8 @@ static xt_status jabber_pkt_features( struct xt_node *node, gpointer data ) if( ( c = xt_find_node( node->children, "session" ) ) ) jd->flags |= JFLAG_WANT_SESSION; - /* This flag is already set if we authenticated via SASL, so now - we can resume the session in the new stream, if we don't have - to bind/initialize the session. */ - if( jd->flags & JFLAG_AUTHENTICATED && ( jd->flags & ( JFLAG_WANT_BIND | JFLAG_WANT_SESSION ) ) == 0 ) - { - if( !jabber_get_roster( ic ) ) - return XT_ABORT; - } - else if( jd->flags & JFLAG_AUTHENTICATED ) - { + if( jd->flags & JFLAG_AUTHENTICATED ) return jabber_pkt_bind_sess( ic, NULL, NULL ); - } return XT_HANDLED; } |