Changeset 81ee561 for protocols/jabber/io.c

Timestamp:

2010-03-20T18:03:18Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

85693e6

Parents:

3330468 (diff), 0baed0d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merging head. Most changes are not so relevant because they're to IM
modules.

File:

• protocols/jabber/io.c (modified) (1 diff)

protocols/jabber/io.c

@@ -380 +380 @@
                 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;