diff options
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | lib/oauth2.c | 3 | ||||
| -rw-r--r-- | lib/xmltree.c | 3 | ||||
| -rw-r--r-- | protocols/jabber/si.c | 6 | ||||
| -rw-r--r-- | root_commands.c | 3 |
5 files changed, 13 insertions, 12 deletions
@@ -411,20 +411,20 @@ elif [ "$ssl" = "sspi" ]; then elif [ "$ssl" = "openssl" ]; then echo echo 'No detection code exists for OpenSSL. Make sure that you have a complete' - echo 'install of OpenSSL (including devel/header files) before reporting' + echo 'installation of OpenSSL (including devel/header files) before reporting' echo 'compilation problems.' echo echo 'Also, keep in mind that the OpenSSL is, according to some people, not' - echo 'completely GPL-compatible. Using GnuTLS or NSS is recommended and better' - echo 'supported by us. However, on many BSD machines, OpenSSL can be considered' - echo 'part of the operating system, which makes it GPL-compatible.' + echo 'completely GPL-compatible. Using GnuTLS is recommended and better supported' + echo 'by us. However, on many BSD machines, OpenSSL can be considered part of the' + echo 'operating system, which makes it GPL-compatible.' echo echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2' echo ' http://www.gnome.org/~markmc/openssl-and-the-gpl.html' echo echo 'Please note that distributing a BitlBee binary which links to OpenSSL is' echo 'probably illegal. If you want to create and distribute a binary BitlBee' - echo 'package, you really should use GnuTLS or NSS instead.' + echo 'package, you really should use GnuTLS instead.' echo echo 'Also, the OpenSSL license requires us to say this:' echo ' * "This product includes software developed by the OpenSSL Project' diff --git a/lib/oauth2.c b/lib/oauth2.c index 62db3500..6921a6d5 100644 --- a/lib/oauth2.c +++ b/lib/oauth2.c @@ -102,7 +102,7 @@ static void oauth2_access_token_done( struct http_request *req ) { struct oauth2_access_token_data *cb_data = req->data; char *atoken = NULL, *rtoken = NULL; - const char *content_type; + char *content_type; if( getenv( "BITLBEE_DEBUG" ) && req->reply_body ) printf( "%s\n", req->reply_body ); @@ -145,6 +145,7 @@ static void oauth2_access_token_done( struct http_request *req ) printf( "Extracted atoken=%s rtoken=%s\n", atoken, rtoken ); cb_data->func( cb_data->data, atoken, rtoken ); + g_free( content_type ); g_free( atoken ); g_free( rtoken ); g_free( cb_data ); diff --git a/lib/xmltree.c b/lib/xmltree.c index 3ecb2b93..f79c53da 100644 --- a/lib/xmltree.c +++ b/lib/xmltree.c @@ -162,9 +162,8 @@ int xt_handle( struct xt_parser *xt, struct xt_node *node, int depth ) xt_status st; int i; - /* Just in case someone likes infinite loops... */ if( xt->root == NULL ) - return 0; + return 1; if( node == NULL ) return xt_handle( xt, xt->root, depth ); diff --git a/protocols/jabber/si.c b/protocols/jabber/si.c index 4b0e57c4..f5f3b2fe 100644 --- a/protocols/jabber/si.c +++ b/protocols/jabber/si.c @@ -292,9 +292,11 @@ int jabber_si_handle_request( struct im_connection *ic, struct xt_node *node, st requestok = FALSE; } - *s = '/'; + if( s ) + *s = '/'; } - else + + if( !requestok ) { reply = jabber_make_error_packet( node, "item-not-found", "cancel", NULL ); if (!jabber_write_packet( ic, reply )) diff --git a/root_commands.c b/root_commands.c index b46b076d..d4adfa81 100644 --- a/root_commands.c +++ b/root_commands.c @@ -552,8 +552,7 @@ static void cmd_account( irc_t *irc, char **cmd ) g_strcasecmp( cmd[1], "del" ) == 0 || ( a = account_get( irc->b, cmd[1] ) ) == NULL ) { - irc_rootmsg( irc, "Could not find account `%s'. Note that the syntax " - "of the account command changed, see \x02help account\x02.", cmd[1] ); + irc_rootmsg( irc, "Could not find account `%s'.", cmd[1] ); return; } |