diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2007-04-15 15:39:35 -0700 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2007-04-15 15:39:35 -0700 |
| commit | c2fb38096ea4e75a680e57e103d4a4986aa84c75 (patch) | |
| tree | d0a8fd0a602867dd6dc406bdc8206fa049ba757e /protocols/jabber/sasl.c | |
| parent | cd4723c257f9f7bd8d4a46c6562f93c2aefc3dbb (diff) | |
Cleaned up struct im_connection. No more username/password stuff since
it's in acc too. wants_to_die is now an argument to imc_logout().
Diffstat (limited to 'protocols/jabber/sasl.c')
| -rw-r--r-- | protocols/jabber/sasl.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c index ab6f6c00..cbd40fb1 100644 --- a/protocols/jabber/sasl.c +++ b/protocols/jabber/sasl.c @@ -44,7 +44,8 @@ xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data ) s = xt_find_attr( node, "xmlns" ); if( !s || strcmp( s, XMLNS_SASL ) != 0 ) { - imc_logout( ic ); + imc_log( ic, "Stream error while authenticating" ); + imc_logout( ic, FALSE ); return XT_ABORT; } @@ -62,7 +63,7 @@ xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data ) if( !sup_plain && !sup_digest ) { imc_error( ic, "No known SASL authentication schemes supported" ); - imc_logout( ic ); + imc_logout( ic, FALSE ); return XT_ABORT; } @@ -279,7 +280,7 @@ xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data ) error: imc_error( ic, "Incorrect SASL challenge received" ); - imc_logout( ic ); + imc_logout( ic, FALSE ); silent_error: g_free( digest_uri ); @@ -302,7 +303,8 @@ xt_status sasl_pkt_result( struct xt_node *node, gpointer data ) s = xt_find_attr( node, "xmlns" ); if( !s || strcmp( s, XMLNS_SASL ) != 0 ) { - imc_logout( ic ); + imc_log( ic, "Stream error while authenticating" ); + imc_logout( ic, FALSE ); return XT_ABORT; } @@ -314,7 +316,7 @@ xt_status sasl_pkt_result( struct xt_node *node, gpointer data ) else if( strcmp( node->name, "failure" ) == 0 ) { imc_error( ic, "Authentication failure" ); - imc_logout( ic ); + imc_logout( ic, FALSE ); return XT_ABORT; } |