diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-20 18:03:18 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-03-20 18:03:18 +0000 |
| commit | 81ee561d520e38535fb6947ac0e3fba808e6de4b (patch) | |
| tree | 122a46d40947e854fa643938c89ae7a6889eb52a /protocols/jabber/io.c | |
| parent | 33304688895db5751f9ef087ff92b0a9dc284627 (diff) | |
| parent | 0baed0da940c0d82280a5674d7fa8ad06d449384 (diff) | |
Merging head. Most changes are not so relevant because they're to IM
modules.
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 bff4e6c8..d6f92a5f 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; } |