aboutsummaryrefslogtreecommitdiffstats
path: root/protocols/jabber/sasl.c
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2007-04-15 18:03:08 -0700
committerWilmer van der Gaast <wilmer@gaast.net>2007-04-15 18:03:08 -0700
commit84b045d409f1e8da6d8bf379c6fef7236dcd9bcd (patch)
tree765681f302614273ac61e1560955a7307252097e /protocols/jabber/sasl.c
parentc2fb38096ea4e75a680e57e103d4a4986aa84c75 (diff)
s/imc/imcb/ for callback functions. Moved things aroundin nogaim.h a
little bit, grouping things by category instead of original Gaim 0.58 filename.
Diffstat (limited to 'protocols/jabber/sasl.c')
-rw-r--r--protocols/jabber/sasl.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c
index cbd40fb1..69199a8b 100644
--- a/protocols/jabber/sasl.c
+++ b/protocols/jabber/sasl.c
@@ -37,14 +37,14 @@ xt_status sasl_pkt_mechanisms( struct xt_node *node, gpointer data )
/* Should abort this now, since we should already be doing
IQ authentication. Strange things happen when you try
to do both... */
- imc_log( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
+ imcb_log( ic, "XMPP 1.0 non-compliant server seems to support SASL, please report this as a BitlBee bug!" );
return XT_HANDLED;
}
s = xt_find_attr( node, "xmlns" );
if( !s || strcmp( s, XMLNS_SASL ) != 0 )
{
- imc_log( ic, "Stream error while authenticating" );
+ imcb_log( ic, "Stream error while authenticating" );
imc_logout( ic, FALSE );
return XT_ABORT;
}
@@ -62,7 +62,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" );
+ imcb_error( ic, "No known SASL authentication schemes supported" );
imc_logout( ic, FALSE );
return XT_ABORT;
}
@@ -279,7 +279,7 @@ xt_status sasl_pkt_challenge( struct xt_node *node, gpointer data )
goto silent_error;
error:
- imc_error( ic, "Incorrect SASL challenge received" );
+ imcb_error( ic, "Incorrect SASL challenge received" );
imc_logout( ic, FALSE );
silent_error:
@@ -303,19 +303,19 @@ 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_log( ic, "Stream error while authenticating" );
+ imcb_log( ic, "Stream error while authenticating" );
imc_logout( ic, FALSE );
return XT_ABORT;
}
if( strcmp( node->name, "success" ) == 0 )
{
- imc_log( ic, "Authentication finished" );
+ imcb_log( ic, "Authentication finished" );
jd->flags |= JFLAG_AUTHENTICATED | JFLAG_STREAM_RESTART;
}
else if( strcmp( node->name, "failure" ) == 0 )
{
- imc_error( ic, "Authentication failure" );
+ imcb_error( ic, "Authentication failure" );
imc_logout( ic, FALSE );
return XT_ABORT;
}