Changes in / [cc6fdf8:573e274]

Files:

• configure (modified) (2 diffs)
• lib/oauth2.c (modified) (2 diffs)
• lib/xmltree.c (modified) (1 diff)
• protocols/jabber/si.c (modified) (1 diff)
• root_commands.c (modified) (1 diff)

configure

@@ -412 +412 @@
         echo
         echo 'No detection code exists for OpenSSL. Make sure that you have a complete'
-        echo 'installation of OpenSSL (including devel/header files) before reporting'
+        echo 'install 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 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 '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
         echo 'For more info, see: http://www.openssl.org/support/faq.html#LEGAL2'
@@ -425 +425 @@
         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 instead.'
+        echo 'package, you really should use GnuTLS or NSS instead.'
         echo
         echo 'Also, the OpenSSL license requires us to say this:'

lib/oauth2.c

@@ -103 +103 @@
         struct oauth2_access_token_data *cb_data = req->data;
         char *atoken = NULL, *rtoken = NULL;
-        char *content_type;
+        const char *content_type;
         
         if( getenv( "BITLBEE_DEBUG" ) && req->reply_body )
@@ -146 +146 @@
         
         cb_data->func( cb_data->data, atoken, rtoken );
-        g_free( content_type );
         g_free( atoken );
         g_free( rtoken );

lib/xmltree.c

@@ -163 +163 @@
         int i;
         
+        /* Just in case someone likes infinite loops... */
         if( xt->root == NULL )
-                return 1;
+                return 0;
         
         if( node == NULL )

protocols/jabber/si.c

@@ -293 +293 @@
                 }
 
-                if( s )
-                        *s = '/';
-        }
-        
-        if( !requestok )
+                *s = '/';
+        }
+        else
         { 
                 reply = jabber_make_error_packet( node, "item-not-found", "cancel", NULL );

root_commands.c

@@ -553 +553 @@
             ( a = account_get( irc->b, cmd[1] ) ) == NULL )
         {
-                irc_rootmsg( irc, "Could not find account `%s'.", cmd[1] );
+                irc_rootmsg( irc, "Could not find account `%s'. Note that the syntax "
+                             "of the account command changed, see \x02help account\x02.", cmd[1] );
                 
                 return;