Changes in / [ba52ac5:537d9b9]

Files:

• .travis.yml (modified) (3 diffs)
• Makefile (modified) (1 diff)
• auth.c (added)
• auth.h (added)
• auth_ldap.c (added)
• auth_pam.c (added)
• bitlbee.conf (modified) (2 diffs)
• bitlbee.h (modified) (4 diffs)
• conf.c (modified) (3 diffs)
• conf.h (modified) (1 diff)
• configure (modified) (6 diffs)
• debian/bitlbee-common.postinst (modified) (3 diffs)
• debian/bitlbee-common.postrm (modified) (1 diff)
• debian/bitlbee-common.prerm (modified) (1 diff)
• debian/bitlbee.prerm (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (7 diffs)
• debian/rules (modified) (4 diffs)
• doc/CHANGES (modified) (1 diff)
• doc/user-guide/commands.xml (modified) (9 diffs)
• doc/user-guide/genhelp.py (modified) (1 diff)
• doc/user-guide/misc.xml (modified) (1 diff)
• init/bitlbee.service.in (modified) (1 diff)
• irc.h (modified) (2 diffs)
• irc_cap.c (modified) (1 diff)
• irc_channel.c (modified) (1 diff)
• irc_commands.c (modified) (2 diffs)
• irc_im.c (modified) (12 diffs)
• irc_send.c (modified) (5 diffs)
• irc_user.c (modified) (1 diff)
• lib/http_client.c (modified) (1 diff)
• lib/misc.c (modified) (3 diffs)
• lib/misc.h (modified) (1 diff)
• lib/proxy.c (modified) (5 diffs)
• lib/sha1.c (modified) (3 diffs)
• lib/ssl_gnutls.c (modified) (2 diffs)
• lib/ssl_openssl.c (modified) (1 diff)
• otr.c (modified) (6 diffs)
• protocols/account.c (modified) (2 diffs)
• protocols/account.h (modified) (2 diffs)
• protocols/bee.h (modified) (3 diffs)
• protocols/bee_chat.c (modified) (1 diff)
• protocols/bee_ft.c (modified) (1 diff)
• protocols/jabber/conference.c (modified) (8 diffs)
• protocols/jabber/iq.c (modified) (4 diffs)
• protocols/jabber/jabber.c (modified) (8 diffs)
• protocols/jabber/jabber.h (modified) (3 diffs)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/jabber/message.c (modified) (2 diffs)
• protocols/jabber/presence.c (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)
• protocols/jabber/sasl.c (modified) (11 diffs)
• protocols/jabber/si.c (modified) (3 diffs)
• protocols/nogaim.c (modified) (7 diffs)
• protocols/nogaim.h (modified) (5 diffs)
• protocols/oscar/conn.c (modified) (2 diffs)
• protocols/purple/bpurple.h (modified) (1 diff)
• protocols/purple/ft.c (modified) (10 diffs)
• protocols/purple/purple.c (modified) (21 diffs)
• protocols/skype/skype.c (modified) (1 diff)
• protocols/twitter/twitter.c (modified) (8 diffs)
• protocols/twitter/twitter.h (modified) (1 diff)
• protocols/twitter/twitter_http.c (modified) (1 diff)
• protocols/twitter/twitter_lib.c (modified) (21 diffs)
• protocols/twitter/twitter_lib.h (modified) (4 diffs)
• root_commands.c (modified) (19 diffs)
• set.h (modified) (1 diff)
• storage.c (modified) (5 diffs)
• storage.h (modified) (3 diffs)
• storage_xml.c (modified) (14 diffs)
• tests/Makefile (modified) (1 diff)
• tests/check_jabber_util.c (modified) (1 diff)
• tests/check_util.c (modified) (1 diff)
• unix.c (modified) (2 diffs)

.travis.yml

@@ -3 +3 @@
 
 script:
- - ./configure
+ - ./configure --pam=1 --ldap=1
  - make check
  - BITLBEE_SKYPE=plugin dpkg-buildpackage -uc -us -d
@@ -29 +29 @@
     - libpurple-dev
     - check
+    - libpam0g-dev
+    - libldap2-dev
   coverity_scan:
     project:
@@ -34 +36 @@
       description: "An IRC to other chat networks gateway"
     notification_email: dx@dxzone.com.ar
-    build_command_prepend: ./configure --otr=1 --debug=1
+    build_command_prepend: ./configure --otr=1 --debug=1 --pam=1 --ldap=1
     build_command: make
     branch_pattern: coverity_scan

Makefile

@@ -10 +10 @@
 
 # Program variables
-objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_cap.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) unix.o conf.o log.o
+objects = bitlbee.o dcc.o help.o ipc.o irc.o irc_im.o irc_cap.o irc_channel.o irc_commands.o irc_send.o irc_user.o irc_util.o nick.o $(OTR_BI) query.o root_commands.o set.o storage.o $(STORAGE_OBJS) auth.o $(AUTH_OBJS) unix.o conf.o log.o
 headers = $(wildcard $(_SRCDIR_)*.h $(_SRCDIR_)lib/*.h $(_SRCDIR_)protocols/*.h)
 subdirs = lib protocols

bitlbee.conf

@@ -52 +52 @@
 # AuthMode = Open
 
+## AuthBackend
+##
+## By default, the authentication data for a user is stored in the storage
+## backend. If you want to authenticate against another authentication system
+## (e.g. ldap), you can specify that here.
+##
+## Beware that this disables password changes and causes passwords for the
+## accounts people create to be stored in plain text instead of encrypted with
+## their bitlbee password.
+##
+## Currently available backends:
+##
+## - storage (internal storage)
+## - pam (Linux PAM authentication)
+## - ldap (LDAP server configured in the openldap settings)
+#
+# AuthBackend = storage
+#
+
 ## AuthPassword
 ##
@@ -69 +88 @@
 ## or
 # OperPassword = md5:I0mnZbn1t4R731zzRdDN2/pK7lRX
+
+## AllowAccountAdd
+##
+## Whether to allow registered and identified users to add new accounts using
+## 'account add'
+##
+# AllowAccountAdd 1
 
 ## HostName

bitlbee.h

@@ -36 +36 @@
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "3.4.1"
+#define BITLBEE_VERSION "3.4.2"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a, b, c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 1)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 4, 2)
+#define BITLBEE_ABI_VERSION_CODE 1
 
 #define MAX_STRING 511
@@ -133 +134 @@
 #include "irc.h"
 #include "storage.h"
+#include "auth.h"
 #include "set.h"
 #include "nogaim.h"
@@ -154 +156 @@
         conf_t *conf;
         GList *storage; /* The first backend in the list will be used for saving */
+        GList *auth;    /* Authentication backends */
         char *helpfile;
         int restart;
@@ -170 +173 @@
 gboolean root_command_add(const char *command, int params, void (*func)(irc_t *, char **args), int flags);
 gboolean cmd_identify_finish(gpointer data, gint fd, b_input_condition cond);
+void cmd_chat_list_finish(struct im_connection *ic);
 gboolean bitlbee_shutdown(gpointer data, gint fd, b_input_condition cond);
 

conf.c

@@ -55 +55 @@
         conf->runmode = RUNMODE_INETD;
         conf->authmode = AUTHMODE_OPEN;
+        conf->auth_backend = NULL;
         conf->auth_pass = NULL;
         conf->oper_pass = NULL;
+        conf->allow_account_add = 1;
         conf->configdir = g_strdup(CONFIG);
         conf->plugindir = g_strdup(PLUGINDIR);
@@ -240 +242 @@
                                         conf->authmode = AUTHMODE_OPEN;
                                 }
+                        } else if (g_strcasecmp(ini->key, "authbackend") == 0) {
+                                if (g_strcasecmp(ini->value, "storage") == 0) {
+                                        conf->auth_backend = NULL;
+                                } else if (g_strcasecmp(ini->value, "pam") == 0 ||
+                                         g_strcasecmp(ini->value, "ldap") == 0) {
+                                        g_free(conf->auth_backend);
+                                        conf->auth_backend = g_strdup(ini->value);
+                                } else {
+                                        fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);
+                                        return 0;
+                                }
                         } else if (g_strcasecmp(ini->key, "authpassword") == 0) {
                                 g_free(conf->auth_pass);
@@ -246 +259 @@
                                 g_free(conf->oper_pass);
                                 conf->oper_pass = g_strdup(ini->value);
+                        } else if (g_strcasecmp(ini->key, "allowaccountadd") == 0) {
+                                if (!is_bool(ini->value)) {
+                                        fprintf(stderr, "Invalid %s value: %s\n", ini->key, ini->value);
+                                        return 0;
+                                }
+                                conf->allow_account_add = bool2int(ini->value);
                         } else if (g_strcasecmp(ini->key, "hostname") == 0) {
                                 g_free(conf->hostname);

conf.h

@@ -37 +37 @@
         runmode_t runmode;
         authmode_t authmode;
+        char *auth_backend;
         char *auth_pass;
         char *oper_pass;
+        int allow_account_add;
         char *hostname;
         char *configdir;

configure

@@ -54 +54 @@
 ssl=auto
 
+pam=0
+ldap=0
+
 pie=1
 
 arch=$(uname -s)
-cpu=$(uname -m)
 
 GLIB_MIN_VERSION=2.16
@@ -138 +140 @@
 --rpc=0/1       Disable/enable RPC plugin interface     $rpc
 
+--pam=0/1       Disable/enable PAM authentication       $pam
+--ldap=0/1      Disable/enable LDAP authentication      $ldap
+
 --doc=0/1       Disable/enable help.txt generation      $doc
 --debug=0/1     Disable/enable debugging                $debug
@@ -200 +205 @@
 
 TARGET=$target
-ARCH=$arch
-CPU=$cpu
 
 INSTALL=install -p
@@ -249 +252 @@
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
-#define ARCH "$arch"
-#define CPU "$cpu"
 EOF
 
@@ -348 +349 @@
 fi
 
-if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
+if ! $PKG_CONFIG --version > /dev/null 2>/dev/null; then
+        echo
+        echo 'Cannot find pkg-config, aborting.'
+        exit 1
+fi
+
+if $PKG_CONFIG glib-2.0; then
         if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
                 cat<<EOF >>Makefile.settings
@@ -641 +648 @@
 done
 echo "STORAGE_OBJS="$STORAGE_OBJS >> Makefile.settings
+
+authobjs=
+authlibs=
+if [ "$pam" = 0 ]; then
+        echo '#undef WITH_PAM' >> config.h
+else
+        if ! echo '#include <security/pam_appl.h>' | $CC -E - >/dev/null 2>/dev/null; then
+                echo 'Cannot find libpam development libraries, aborting. (Install libpam0g-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_PAM' >> config.h
+        authobjs=$authobjs'auth_pam.o '
+        authlibs=$authlibs'-lpam '
+fi
+if [ "$ldap" = 0 ]; then
+        echo '#undef WITH_LDAP' >> config.h
+else
+        if ! echo '#include <ldap.h>' | $CC -E - >/dev/null 2>/dev/null; then
+                echo 'Cannot find libldap development libraries, aborting. (Install libldap2-dev?)'
+                exit 1
+        fi
+        echo '#define WITH_LDAP' >> config.h
+        authobjs=$authobjs'auth_ldap.o '
+        authlibs=$authlibs'-lldap '
+fi
+echo AUTH_OBJS=$authobjs >> Makefile.settings
+echo EFLAGS+=$authlibs >> Makefile.settings
 
 if [ "$strip" = 0 ]; then

debian/bitlbee-common.postinst

@@ -9 +9 @@
 
 CONFDIR=/var/lib/bitlbee/
-
-update-rc.d bitlbee defaults > /dev/null 2>&1
 
 ## Load default option. Don't want to put this in debconf (yet?)
@@ -66 +64 @@
 fi
 
-if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" ]; then
+if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" -a -x "/etc/init.d/bitlbee" ]; then
         invoke-rc.d bitlbee restart
 fi
@@ -92 +90 @@
 fi
 
-if [ -z "$2" ]; then
-        invoke-rc.d bitlbee start
-fi
+#DEBHELPER#

debian/bitlbee-common.postrm

@@ -3 +3 @@
 set -e
 
-[ "$1" = "purge" ] || exit 0
-
-if [ -e /usr/share/debconf/confmodule ]; then
-        . /usr/share/debconf/confmodule;
-        db_purge;
+if [ "$1" = "purge" ]; then
+        rm -f /etc/default/bitlbee
+        deluser --system bitlbee || true
+        rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
 fi
 
-update-rc.d bitlbee remove > /dev/null 2>&1 || true
-rm -f /etc/default/bitlbee
-
-deluser --system bitlbee || true
-rm -rf /var/lib/bitlbee ## deluser doesn't seem to do this for homedirs in /var
+#DEBHELPER#

debian/bitlbee-common.prerm

@@ -11 +11 @@
                 mv /usr/share/bitlbee/help.txt /usr/share/bitlbee/help.upgrading
         fi
-else
-        invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#

debian/bitlbee.prerm

@@ -6 +6 @@
         invoke-rc.d bitlbee stop
 fi
+
+#DEBHELPER#

debian/changelog

@@ +1 @@
+bitlbee (3.4.2-1) unstable; urgency=medium
+
+  [ Jelmer Vernooij ]
+  * Make the build reproducible by not encoding ARCH / CPU defines in
+    the binary.
+  * Fix Vcs-* control headers after migration to Git.
+  * Don't start synopsis with an article.
+  * Bump standards version to 3.9.8 (no changes).
+  * Use dh_prep rather than deprecated 'dh_clean -k'.
+
+  [ Wilmer van der Gaast ]
+  * New upstream release.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 12 Jun 2016 22:31:18 +0100
+
 bitlbee (3.4.1-1) unstable; urgency=medium
 

debian/control

@@ -3 +3 @@
 Priority: optional
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
-Uploaders: Jelmer Vernooij <jelmer@debian.org>
-Standards-Version: 3.9.5
-Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~)
+Uploaders: Jelmer Vernooij <jelmer@debian.org>
+Standards-Version: 3.9.8
+Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), dh-systemd (>= 1.5) | debhelper (<< 9.20131227)
 Homepage: http://www.bitlbee.org/
-Vcs-Bzr: http://code.bitlbee.org/bitlbee/
+Vcs-Git: https://github.com/bitlbee/bitlbee
+Vcs-Browser: https://github.com/bitlbee/bitlbee
 
 Package: bitlbee
@@ -14 +15 @@
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
-Description: An IRC to other chat networks gateway (default version)
+Description: IRC to other chat networks gateway (default version)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
@@ -24 +25 @@
 Conflicts: bitlbee
 Replaces: bitlbee
-Description: An IRC to other chat networks gateway (using libpurple)
+Description: IRC to other chat networks gateway (using libpurple)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
@@ -40 +41 @@
 Depends: ${misc:Depends}, net-tools, adduser
 Replaces: bitlbee
-Description: An IRC to other chat networks gateway (common files/docs)
+Description: IRC to other chat networks gateway (common files/docs)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
@@ -51 +52 @@
 Architecture: all
 Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
-Description: An IRC to other chat networks gateway (dev files)
+Description: IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
@@ -61 +62 @@
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
-Description: An IRC to other chat networks gateway (OTR plugin)
+Description: IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
@@ -73 +74 @@
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
 Recommends: skyped
-Description: An IRC to other chat networks gateway (Skype plugin)
+Description: IRC to other chat networks gateway (Skype plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk

debian/rules

@@ -40 +40 @@
 CONFIGURE_OVERRIDES:=CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
+HAS_DH_SYSTEMD:=$(shell dpkg-query -W -f='$${Status}' dh-systemd 2>/dev/null | grep -c "ok installed")
+
 build: build-stamp
 build-stamp:
@@ -72 +74 @@
         dh_testdir
         dh_testroot
-        dh_clean -k
+        dh_prep
         dh_installdirs
 
@@ -80 +82 @@
         $(MAKE) -C debian/build-native install-plugin-otr DESTDIR=`pwd`/debian/bitlbee-plugin-otr
         $(MAKE) -C debian/build-native install-plugin-skype DESTDIR=`pwd`/debian/skyped
+
+ifeq ($(HAS_DH_SYSTEMD),1)
+        $(MAKE) -C debian/build-native install-systemd DESTDIR=`pwd`/debian/bitlbee-common
+endif
 
 ifneq ($(BITLBEE_SKYPE),0)
@@ -108 +114 @@
         for p in bitlbee bitlbee-libpurple bitlbee-dev bitlbee-plugin-otr; do rm -r debian/$$p/usr/share/doc/$$p && ln -s bitlbee-common debian/$$p/usr/share/doc/$$p || true; done
         dh_installdebconf
+ifeq ($(HAS_DH_SYSTEMD),1)
+        dh_systemd_enable
         dh_installinit --init-script=bitlbee
+        dh_systemd_start
+else
+        dh_installinit --init-script=bitlbee
+endif
         dh_installman
         dh_lintian

doc/CHANGES

@@ -3 +3 @@
 
 https://github.com/bitlbee/bitlbee/commits/master
+
+Version 3.4.2:
+- irc:
+  * Self-messages (messages sent by yourself from other IM clients), given
+    support by the IM protocols and your IRC client. See this for details:
+    https://wiki.bitlbee.org/SelfMessages
+  * IRCv3.1 support and part of 3.2: cap-3.2, sasl-3.2, multi-prefix,
+    away-notify, extended-join, userhost-in-names
+  * Send numeric errors when failing to join a channel, to not confuse clients
+  * Channel autojoins should be more reliable now.
+- jabber:
+  * Carbons (XEP-0280), for self-message support. It's not widely supported
+    by most public XMPP servers (easier if you host your own), but this will
+    probably change in the next few years. Thanks kormat for the original patch.
+  * Fix typing notifications between two bitlbee users or with gtalk users
+  * Remove facebook XMPP code, point people at bitlbee-facebook.
+  * Show groupchat kick/ban/leave reasons
+  * SASL ANONYMOUS (XEP-0175), for "guest" logins, see "help set anonymous"
+  * Hipchat: 'chat add hipchat "channel name"' now tries to guess the JID
+- purple:
+  * Fix problems remembering SSL certificates as trusted
+  * Fix /join #channel, which joined a differently named channel
+  * Fix crash when doing "chat with" with skypeweb
+  * Fix html entities appearing in some protocols
+  * Fix setting away states in jabber, which failed silently
+  * Implement notify_message UI op, to be able to show some error messages.
+- skype:
+  * Show all messages as groupchats since we can't tell which ones are private.
+  * This plugin is mostly-deprecated and mostly-broken but it's still useful
+    for p2p-based groupchats, which aren't delivered over newer protocols.
+    Everyone else should use the skypeweb purple plugin or msn instead.
+- msn:
+  * Minor tweaks. Faster login, better error reporting, fixed add/remove.
+    Still MSNP21. Disregard that "Next release!" in the previous release.
+- otr:
+  * Don't use NOTICE for user messages (revmischa)
+  * Fix crashes when using the jabber xmlconsole
+  * A few minor fixes: color multiline messages, filter incoming color codes.
+- Packaging:
+  * Show ./configure args in bitlbee -V, config.h and Makefile.settings
+  * Allow setting the plugin dir in bitlbee.conf, for NixOS (anderspapitto)
+  * Improved cross compiler support (gamaral)
+- Other important bugfixes:
+  * Fix potential crashes when leaving temporary channels
+  * Fix all sorts of crashing bugs when cancelling in-progress connections.
+
+Finished 19 Mar 2016
 
 Version 3.4.1:

doc/user-guide/commands.xml

@@ -258 +258 @@
 
                         <para>
-                                Available actions: add, with. See <emphasis>help chat &lt;action&gt;</emphasis> for more information.
+                                Available actions: add, with, list. See <emphasis>help chat &lt;action&gt;</emphasis> for more information.
                         </para>
 
@@ -264 +264 @@
 
                 <bitlbee-command name="add">
-                        <syntax>chat add &lt;account id&gt; &lt;room&gt; [&lt;channel&gt;]</syntax>
+                        <syntax>chat add &lt;account id&gt; &lt;room|!index&gt; [&lt;channel&gt;]</syntax>
 
                         <description>
@@ -272 +272 @@
 
                                 <para>
-                                        After adding a room to your list, you can simply use the IRC /join command to enter the room. Also, you can tell BitlBee to automatically join the room when you log in. (See <emphasis>chat set</emphasis>)
+                                        After adding a room to your list, you can simply use the IRC /join command to enter the room. Also, you can tell BitlBee to automatically join the room when you log in. (<emphasis>channel &lt;channel&gt; set auto_join true</emphasis>)
                                 </para>
 
@@ -280 +280 @@
                         </description>
 
+                </bitlbee-command>
+
+                <bitlbee-command name="list">
+                        <syntax>chat list &lt;account id&gt; [&lt;server&gt;]</syntax>
+
+                        <description>
+                                <para>
+                                        List existing chatrooms provided by an account. BitlBee needs this to propogate an internal list of chats. The existing chat can then be added with <emphasis>chat add</emphasis>, using the number in the index column after a "!" as a shortcut.
+                                </para>
+                        </description>
+
+                        <ircexample>
+                                <ircline nick="dx">chat list facebook</ircline>
+                                <ircline pre="1" nick="root">Index  Title                 Topic</ircline>
+                                <ircline pre="1" nick="root">    1  869891016470949       cool kids club</ircline>
+                                <ircline pre="1" nick="root">    2  457892181062459       uncool kids club</ircline>
+                                <ircline nick="root">2 facebook chatrooms</ircline>
+                                <ircline nick="dx">chat add facebook !1 #cool-kids-club</ircline>
+                        </ircexample>
                 </bitlbee-command>
 
@@ -288 +307 @@
                                 <para>
                                         While most <emphasis>chat</emphasis> subcommands are about named chatrooms, this command can be used to open an unnamed groupchat with one or more persons. This command is what <emphasis>/join #nickname</emphasis> used to do in older BitlBee versions.
+                                </para>
+
+                                <para>
+                                        Another way to do this is to join to a new, empty channel with <emphasis>/join #newchannel</emphasis> and invite the first person with <emphasis>/invite nickname</emphasis>
                                 </para>
                         </description>
@@ -645 +668 @@
                         <para>
                                 When you're already connected to a BitlBee server and you connect (and identify) again, BitlBee will offer to migrate your existing session to the new connection. If for whatever reason you don't want this, you can disable this setting.
+                        </para>
+                </description>
+        </bitlbee-setting>
+
+        <bitlbee-setting name="always_use_nicks" type="boolean" scope="channel">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Jabber groupchat specific. This setting ensures that the nicks defined by the other members of a groupchat are used, instead of the username part of their JID. This only applies to groupchats where their real JID is known (either "non-anonymous" ones, or "semi-anonymous" from the point of view of the channel moderators)
+                        </para>
+
+                        <para>
+                                Enabling this may have the side effect of changing the nick of existing contacts, either in your buddy list or in other groupchats. If a contact is in multiple groupchats with different nicks, enabling this setting for all those would result in multiple nick changes when joining, and the order of those changes may vary.
+                        </para>
+
+                        <para>
+                                Note that manual nick changes done through the <emphasis>rename</emphasis> command always take priority
                         </para>
                 </description>
@@ -1491 +1532 @@
                                 and any modes they should have. The following statuses are currently
                                 recognised: <emphasis>online</emphasis> (i.e. available, not
-                                away), <emphasis>special</emphasis>, <emphasis>away</emphasis>,
-                                and <emphasis>offline</emphasis>.
+                                away), <emphasis>special</emphasis> (specific to the protocol), 
+                                <emphasis>away</emphasis>, and <emphasis>offline</emphasis>.
                         </para>
                         
@@ -1498 +1539 @@
                                 If a status is followed by a valid channel mode character
                                 (@, % or +), it will be given to users with that status.
-                                For example, <emphasis>online@,special%,away+,offline</emphasis>
+                                For example, <emphasis>online@,special%,away+,offline</emphasis> 
                                 will show all users in the channel. Online people will
                                 have +o, people who are online but away will have +v,
@@ -1815 +1856 @@
                         </para>
                 </description>
+        </bitlbee-command>
+
+        <bitlbee-command name="plugins">
+                <short-description>List all the external plugins and protocols</short-description>
+                <syntax>plugins</syntax>
+
+                <description>
+                        <para>
+                                This gives you a list of all the external plugins and protocols.
+                        </para>
+                </description>
+
         </bitlbee-command>
 

doc/user-guide/genhelp.py

@@ -65 +65 @@
 
     # Actually normalize whitespace
-    tag.text = normalize(tag.text)
+    if 'pre' not in tag.attrib:
+        tag.text = normalize(tag.text)
     tag.tail = normalize(tag.tail)
 

doc/user-guide/misc.xml

@@ -445 +445 @@
 </sect1>
 
+<sect1 id="whatsnew030402">
+<title>New stuff in BitlBee 3.4.2</title>
+
+<simplelist>
+        <member><emphasis>irc:</emphasis> Self-messages (messages sent by yourself from other IM clients), see <emphasis>help set self_messages</emphasis>. IRCv3.1 support and part of 3.2. Many important groupchat related bugfixes.</member>
+        <member><emphasis>jabber:</emphasis> Carbons, see <emphasis>help set carbons</emphasis>. Removed facebook XMPP, use bitlbee-facebook instead. SASL ANONYMOUS login, see <emphasis>help set anonymous</emphasis>.</member>
+        <member><emphasis>hipchat:</emphasis> Channels can now be added with <emphasis>chat add hipchat "channel name"</emphasis> which tries to guess the channel JID.</member>
+        <member><emphasis>skype:</emphasis> Show all messages as groupchats since we can't tell which ones are private. This plugin is mostly-deprecated and mostly-broken, use the skypeweb purple plugin or msn instead.</member>
+        <member><emphasis>purple:</emphasis> Fix problems remembering SSL certificates as trusted. Groupchat related fixes. Better error reporting. Fixed setting jabber away states.</member>
+</simplelist>
+
+<para>
+        And lots of bugfixes / stability improvements. See the full changelog for details!
+</para>
+
+</sect1>
+
 </chapter>

init/bitlbee.service.in

@@ -5 +5 @@
 [Service]
 ExecStart=@sbindir@bitlbee -F -n
+KillMode=process
 
 [Install]

irc.h

@@ -29 +29 @@
 #define IRC_MAX_LINE 512
 #define IRC_MAX_ARGS 16
+#define IRC_WORD_WRAP 425
 
 #define IRC_LOGIN_TIMEOUT 60
@@ -92 +93 @@
                            logging in, this may contain a password we should
                            send to identify after USER/NICK are received. */
+        char *auth_backend;
 
         char umode[8];

irc_cap.c

@@ -177 +177 @@
 
         } else if (g_strcasecmp(cmd[1], "END") == 0) {
+                if (!(irc->status & USTATUS_CAP_PENDING)) {
+                        return;
+                }
                 irc->status &= ~USTATUS_CAP_PENDING;
 

irc_channel.c

@@ -245 +245 @@
         ic->users = g_slist_insert_sorted(ic->users, icu, irc_channel_user_cmp);
 
-        irc_channel_update_ops(ic, set_getstr(&ic->irc->b->set, "ops"));
+        if (iu == ic->irc->user || iu == ic->irc->root) {
+                irc_channel_update_ops(ic, set_getstr(&ic->irc->b->set, "ops"));
+        }
 
         if (iu == ic->irc->user || ic->flags & IRC_CHANNEL_JOINED) {

irc_commands.c

@@ -97 +97 @@
         /* just check the password here to be able to reply with useful numerics
          * the actual identification will be handled later */
-        status = storage_check_pass(user, pass);
+        status = auth_check_pass(irc, user, pass);
 
         if (status == STORAGE_OK) {
@@ -767 +767 @@
 static void irc_cmd_version(irc_t *irc, char **cmd)
 {
-        irc_send_num(irc, 351, "%s-%s. %s :%s/%s ",
-                     PACKAGE, BITLBEE_VERSION, irc->root->host, ARCH, CPU);
+        irc_send_num(irc, 351, "%s-%s. %s :",
+                     PACKAGE, BITLBEE_VERSION, irc->root->host);
 }
 

irc_im.c

@@ -120 +120 @@
         }
 
-        if ((irc->caps & CAP_AWAY_NOTIFY) &&
-            ((bu->flags & BEE_USER_AWAY) != (old->flags & BEE_USER_AWAY) ||
-             (bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE))) {
-                irc_send_away_notify(iu);
-        }
-
         if ((bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE)) {
                 if (bu->flags & BEE_USER_ONLINE) {
@@ -153 +147 @@
 
         bee_irc_channel_update(irc, NULL, iu);
+
+        /* If away-notify enabled, send status updates when:
+         * Away or Online state changes
+         * Status changes (e.g. "Away" to "Mobile")
+         * Status message changes
+         */
+        if ((irc->caps & CAP_AWAY_NOTIFY) &&
+            ((bu->flags & BEE_USER_AWAY) != (old->flags & BEE_USER_AWAY) ||
+             (bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE) ||
+             (g_strcmp0(bu->status, old->status) != 0) ||
+             (g_strcmp0(bu->status_msg, old->status_msg) != 0))) {
+                irc_send_away_notify(iu);
+        }
 
         return TRUE;
@@ -292 +299 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
         g_free(wrapped);
@@ -342 +349 @@
 }
 
-static gboolean bee_irc_user_nick_update(irc_user_t *iu);
+static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only);
 
 static gboolean bee_irc_user_fullname(bee_t *bee, bee_user_t *bu)
@@ -370 +377 @@
         }
 
-        bee_irc_user_nick_update(iu);
+        bee_irc_user_nick_update(iu, TRUE);
 
         return TRUE;
@@ -377 +384 @@
 static gboolean bee_irc_user_nick_hint(bee_t *bee, bee_user_t *bu, const char *hint)
 {
-        bee_irc_user_nick_update((irc_user_t *) bu->ui_data);
+        bee_irc_user_nick_update((irc_user_t *) bu->ui_data, TRUE);
+
+        return TRUE;
+}
+
+static gboolean bee_irc_user_nick_change(bee_t *bee, bee_user_t *bu, const char *nick)
+{
+        bee_irc_user_nick_update((irc_user_t *) bu->ui_data, FALSE);
 
         return TRUE;
@@ -386 +400 @@
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         irc_t *irc = (irc_t *) bee->ui_data;
-        bee_user_flags_t online;
-
-        /* Take the user offline temporarily so we can change the nick (if necessary). */
-        if ((online = bu->flags & BEE_USER_ONLINE)) {
-                bu->flags &= ~BEE_USER_ONLINE;
-        }
 
         bee_irc_channel_update(irc, NULL, iu);
-        bee_irc_user_nick_update(iu);
-
-        if (online) {
-                bu->flags |= online;
-                bee_irc_channel_update(irc, NULL, iu);
-        }
-
-        return TRUE;
-}
-
-static gboolean bee_irc_user_nick_update(irc_user_t *iu)
+        bee_irc_user_nick_update(iu, FALSE);
+
+        return TRUE;
+}
+
+static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only)
 {
         bee_user_t *bu = iu->bu;
         char *newnick;
 
-        if (bu->flags & BEE_USER_ONLINE) {
+        if (offline_only && bu->flags & BEE_USER_ONLINE) {
                 /* Ignore if the user is visible already. */
                 return TRUE;
@@ -432 +435 @@
 {
         bee_user_t *bu = iu->bu;
-        bee_user_flags_t online;
 
         if (bu == FALSE) {
@@ -438 +440 @@
         }
 
-        /* In this case, pretend the user is offline. */
-        if ((online = bu->flags & BEE_USER_ONLINE)) {
-                bu->flags &= ~BEE_USER_ONLINE;
-        }
-
         nick_del(bu);
-        bee_irc_user_nick_update(iu);
-
-        bu->flags |= online;
+        bee_irc_user_nick_update(iu, FALSE);
+
 }
 
@@ -461 +457 @@
         }
 
-        if ((away = irc_user_get_away(iu)) &&
+        if (iu->last_channel == NULL &&
+            (away = irc_user_get_away(iu)) &&
             time(NULL) >= iu->away_reply_timeout) {
                 irc_send_num(iu->irc, 301, "%s :%s", iu->nick, away);
@@ -676 +673 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts);
         g_free(ts);
@@ -1146 +1143 @@
 
         bee_irc_log,
+        bee_irc_user_nick_change,
 };

irc_send.c

@@ -41 +41 @@
 {
         irc_send_num(irc,   1, ":Welcome to the %s gateway, %s", PACKAGE, irc->user->nick);
-        irc_send_num(irc,   2, ":Host %s is running %s %s %s/%s.", irc->root->host,
-                     PACKAGE, BITLBEE_VERSION, ARCH, CPU);
+        irc_send_num(irc,   2, ":Host %s is running %s %s.", irc->root->host,
+                     PACKAGE, BITLBEE_VERSION);
         irc_send_num(irc,   3, ":%s", IRCD_INFO);
         irc_send_num(irc,   4, "%s %s %s %s", irc->root->host, BITLBEE_VERSION, UMODES UMODES_PRIV, CMODES);
@@ -54 +54 @@
 void irc_send_motd(irc_t *irc)
 {
-        char motd[2048];
-        ssize_t len;
-        int fd;
-
-        fd = open(global.conf->motdfile, O_RDONLY);
-        if (fd == -1 || (len = read(fd, motd, sizeof(motd) - 1)) <= 0) {
+        char *motd;
+        size_t len;
+
+        g_file_get_contents(global.conf->motdfile, &motd, &len, NULL);
+
+        if (!motd || !len) {
                 irc_send_num(irc, 422, ":We don't need MOTDs.");
         } else {
@@ -66 +66 @@
 
                 in = motd;
-                motd[len] = '\0';
                 linebuf[79] = len = 0;
                 max = sizeof(linebuf) - 1;
@@ -101 +100 @@
         }
 
-        if (fd != -1) {
-                close(fd);
-        }
+        g_free(motd);
+
 }
 
@@ -348 +346 @@
                 }
 
-                /* rfc1459 doesn't mention this: G means gone, H means here */
-                status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+                /* If this is the account nick, check configuration to see if away */
+                if (iu == irc->user) {
+                        /* rfc1459 doesn't mention this: G means gone, H means here */
+                        status_prefix[0] = set_getstr(&irc->b->set, "away") ? 'G' : 'H';
+                } else {
+                        status_prefix[0] = iu->flags & IRC_USER_AWAY ? 'G' : 'H';
+                }
 
                 irc_send_num(irc, 352, "%s %s %s %s %s %s :0 %s",

irc_user.c

@@ -251 +251 @@
         if (g_strcasecmp(ctcp[0], "VERSION") == 0) {
                 irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",
-                               ctcp[0], PACKAGE " " BITLBEE_VERSION " " ARCH "/" CPU);
+                               ctcp[0], PACKAGE " " BITLBEE_VERSION);
         } else if (g_strcasecmp(ctcp[0], "PING") == 0) {
                 irc_send_msg_f(iu, "NOTICE", iu->irc->user->nick, "\001%s %s\001",

lib/http_client.c

@@ -95 +95 @@
         request = g_strdup_printf("GET %s HTTP/1.0\r\n"
                                   "Host: %s\r\n"
-                                  "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n"
+                                  "User-Agent: BitlBee " BITLBEE_VERSION "\r\n"
                                   "\r\n", url->file, url->host);
 

lib/misc.c

@@ -549 +549 @@
 }
 
-/* Word wrapping. Yes, I know this isn't UTF-8 clean. I'm willing to take the risk. */
 char *word_wrap(const char *msg, int line_len)
 {
@@ -582 +581 @@
                 }
                 if (i == 0) {
-                        g_string_append_len(ret, msg, line_len);
+                        const char *end;
+                        size_t len;
+
+                        g_utf8_validate(msg, line_len, &end);
+
+                        len = (end != msg) ? end - msg : line_len;
+
+                        g_string_append_len(ret, msg, len);
                         g_string_append_c(ret, '\n');
-                        msg += line_len;
+                        msg += len;
                 }
         }
@@ -787 +793 @@
         return string;
 }
+
+/* Returns a string that is exactly 'char_len' utf8 characters long (not bytes),
+ * padded to the right with spaces or truncated with the 'ellipsis' parameter
+ * if specified (can be NULL).
+ * Returns a newly allocated string, or NULL on invalid parameters. */
+char *str_pad_and_truncate(const char *string, long char_len, const char *ellipsis)
+{
+        size_t string_len = strlen(string);
+        size_t ellipsis_len = (ellipsis) ? strlen(ellipsis) : 0;
+        long orig_len = g_utf8_strlen(string, -1);
+
+        g_return_val_if_fail(char_len > ellipsis_len, NULL);
+
+        if (orig_len > char_len) {
+                char *ret = g_malloc(string_len + 1);
+                g_utf8_strncpy(ret, string, char_len - ellipsis_len);
+                if (ellipsis) {
+                        g_strlcat(ret, ellipsis, string_len);
+                }
+                return ret;
+        } else if (orig_len < char_len) {
+                return g_strdup_printf("%s%*s", string, (int) (char_len - orig_len), "");
+        } else {
+                return g_strdup(string);
+        }
+}

lib/misc.h

@@ -151 +151 @@
 G_MODULE_EXPORT gboolean parse_int64(char *string, int base, guint64 *number);
 G_MODULE_EXPORT char *str_reject_chars(char *string, const char *reject, char replacement);
+G_MODULE_EXPORT char *str_pad_and_truncate(const char *string, long char_len, const char *ellipsis);
 
 #endif

lib/proxy.c

@@ -87 +87 @@
 }
 
+/* calls phb->func safely by ensuring that the phb struct doesn't exist in the
+ * case that proxy_disconnect() is called down there */
+static gboolean phb_connected(struct PHB *phb, gint source)
+{
+        /* save func and data here */
+        b_event_handler func = phb->func;
+        gpointer data = phb->data;
+
+        /* free the struct so that it can't be freed by the callback */
+        phb_free(phb, TRUE);
+
+        /* if any proxy_disconnect() call happens here, it will use the
+         * fd (still open), look it up in the hash table, get NULL, and
+         * proceed to close the fd and do nothing else */
+        func(data, source, B_EV_IO_READ);
+
+        return FALSE;
+}
+
 static gboolean proxy_connected(gpointer data, gint source, b_input_condition cond)
 {
@@ -125 +144 @@
                 phb->proxy_func(phb->proxy_data, source, B_EV_IO_READ);
         } else {
-                phb->func(phb->data, source, B_EV_IO_READ);
-                phb_free(phb, TRUE);
+                phb_connected(phb, source);
         }
 
@@ -222 +240 @@
         if ((memcmp(HTTP_GOODSTRING, inputline, strlen(HTTP_GOODSTRING)) == 0) ||
             (memcmp(HTTP_GOODSTRING2, inputline, strlen(HTTP_GOODSTRING2)) == 0)) {
-                phb->func(phb->data, source, B_EV_IO_READ);
-                return phb_free(phb, TRUE);
+                return phb_connected(phb, source);
         }
 
@@ -295 +312 @@
         memset(packet, 0, sizeof(packet));
         if (read(source, packet, 9) >= 4 && packet[1] == 90) {
-                phb->func(phb->data, source, B_EV_IO_READ);
-                return phb_free(phb, TRUE);
+                return phb_connected(phb, source);
         }
 
@@ -384 +400 @@
         }
 
-        phb->func(phb->data, source, B_EV_IO_READ);
-        return phb_free(phb, TRUE);
+        return phb_connected(phb, source);
 }
 

lib/sha1.c

@@ -24 +24 @@
 #define HMAC_BLOCK_SIZE 64
 
-/* BitlBee addition: */
-void sha1_hmac(const char *key_, size_t key_len, const char *payload, size_t payload_len, guint8 digest[SHA1_HASH_SIZE])
+void b_hmac(GChecksumType checksum_type, const char *key_, size_t key_len,
+            const char *payload, size_t payload_len, guint8 **digest)
 {
-        sha1_state_t sha1;
-        guint8 hash[SHA1_HASH_SIZE];
+        GChecksum *checksum;
+        size_t hash_len;
+        guint8 *hash;
         guint8 key[HMAC_BLOCK_SIZE + 1];
         int i;
+
+        hash_len = g_checksum_type_get_length(checksum_type);
+
+        if (hash_len == (size_t) -1) {
+                return;
+        }
+
+        hash = g_malloc(hash_len);
 
         if (key_len == 0) {
@@ -43 +52 @@
         memset(key, 0, HMAC_BLOCK_SIZE + 1);
         if (key_len > HMAC_BLOCK_SIZE) {
-                sha1_init(&sha1);
-                sha1_append(&sha1, (guint8 *) key_, key_len);
-                sha1_finish(&sha1, key);
+                checksum = g_checksum_new(checksum_type);
+                g_checksum_update(checksum, (guint8 *) key_, key_len);
+                g_checksum_get_digest(checksum, key, &hash_len);
+                g_checksum_free(checksum);
         } else {
                 memcpy(key, key_, key_len);
@@ -51 +61 @@
 
         /* Inner part: H(K XOR 0x36, text) */
-        sha1_init(&sha1);
+        checksum = g_checksum_new(checksum_type);
         for (i = 0; i < HMAC_BLOCK_SIZE; i++) {
                 key[i] ^= 0x36;
         }
-        sha1_append(&sha1, key, HMAC_BLOCK_SIZE);
-        sha1_append(&sha1, (const guint8 *) payload, payload_len);
-        sha1_finish(&sha1, hash);
+        g_checksum_update(checksum, key, HMAC_BLOCK_SIZE);
+        g_checksum_update(checksum, (const guint8 *) payload, payload_len);
+        g_checksum_get_digest(checksum, hash, &hash_len);
+        g_checksum_free(checksum);
 
         /* Final result: H(K XOR 0x5C, inner stuff) */
-        sha1_init(&sha1);
+        checksum = g_checksum_new(checksum_type);
         for (i = 0; i < HMAC_BLOCK_SIZE; i++) {
                 key[i] ^= 0x36 ^ 0x5c;
         }
-        sha1_append(&sha1, key, HMAC_BLOCK_SIZE);
-        sha1_append(&sha1, hash, SHA1_HASH_SIZE);
-        sha1_finish(&sha1, digest);
+        g_checksum_update(checksum, key, HMAC_BLOCK_SIZE);
+        g_checksum_update(checksum, hash, hash_len);
+        g_checksum_get_digest(checksum, *digest, &hash_len);
+        g_checksum_free(checksum);
+
+        g_free(hash);
 }
+
+void sha1_hmac(const char *key_, size_t key_len, const char *payload, size_t payload_len, guint8 digest[SHA1_HASH_SIZE])
+{
+        b_hmac(G_CHECKSUM_SHA1, key_, key_len, payload, payload_len, &digest);
+}
+
 
 /* I think this follows the scheme described on:

lib/ssl_gnutls.c

@@ -42 +42 @@
 #include <limits.h>
 
-#if defined(ULONG_MAX) && ULONG_MAX > 4294967295UL
-#define GNUTLS_STUPID_CAST (long)
-#else
-#define GNUTLS_STUPID_CAST (int)
-#endif
-
 #define SSLDEBUG 0
 
@@ -335 +329 @@
 
         sock_make_nonblocking(conn->fd);
-        gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr_t) GNUTLS_STUPID_CAST conn->fd);
+        gnutls_transport_set_ptr(conn->session, (gnutls_transport_ptr_t) (long) conn->fd);
 
         ssl_cache_resume(conn);

lib/ssl_openssl.c

@@ -67 +67 @@
         SSL_library_init();
 
-        meth = TLSv1_client_method();
+        meth = SSLv23_client_method();
         ssl_ctx = SSL_CTX_new(meth);
+        SSL_CTX_set_options(ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
 
         initialized = TRUE;

otr.c

@@ -268 +268 @@
 }
 
+#ifndef OTR_BI
+struct plugin_info *init_plugin_info(void)
+{
+        static struct plugin_info info = {
+                BITLBEE_ABI_VERSION_CODE,
+                "otr",
+                BITLBEE_VERSION,
+                "Off-the-Record communication",
+                NULL,
+                NULL
+        };
+
+        return &info;
+}
+#endif
+
 gboolean otr_irc_new(irc_t *irc)
 {
@@ -413 +429 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (a->prpl->options & OPT_NOOTR) {
+        if (a->prpl->options & PRPL_OPT_NOOTR) {
                 return 0;
         }
@@ -441 +457 @@
 
         /* don't do OTR on certain (not classic IM) protocols, e.g. twitter */
-        if (ic->acc->prpl->options & OPT_NOOTR ||
+        if (ic->acc->prpl->options & PRPL_OPT_NOOTR ||
             iu->bu->flags & BEE_USER_NOOTR) {
                 return msg;
@@ -1384 +1400 @@
 void display_otr_message(void *opdata, ConnContext *ctx, const char *fmt, ...)
 {
+        char *msg_, *msg;
         struct im_connection *ic =
                 check_imc(opdata, ctx->accountname, ctx->protocol);
@@ -1391 +1408 @@
 
         va_start(va, fmt);
-        char *msg = g_strdup_vprintf(fmt, va);
+        msg_ = g_strdup_vprintf(fmt, va);
         va_end(va);
+
+        msg = word_wrap(msg_, IRC_WORD_WRAP);
 
         if (u) {
@@ -1401 +1420 @@
         }
 
+        g_free(msg_);
         g_free(msg);
 }

protocols/account.c

@@ -63 +63 @@
 
         s = set_add(&a->set, "password", NULL, set_eval_account, a);
-        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD;
+        s->flags |= SET_NOSAVE | SET_NULL_OK | SET_PASSWORD | ACC_SET_LOCKABLE;
 
         s = set_add(&a->set, "tag", NULL, set_eval_account, a);
@@ -69 +69 @@
 
         s = set_add(&a->set, "username", NULL, set_eval_account, a);
-        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY;
+        s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | ACC_SET_LOCKABLE;
         set_setstr(&a->set, "username", user);
 

protocols/account.h

@@ -61 +61 @@
         ACC_SET_OFFLINE_ONLY = 0x02,    /* Allow changes only if the acct is offline. */
         ACC_SET_ONLINE_ONLY = 0x04,     /* Allow changes only if the acct is online. */
+        ACC_SET_LOCKABLE = 0x08         /* Setting cannot be changed if the account is locked down */
 } account_set_flag_t;
 
@@ -68 +69 @@
         ACC_FLAG_HANDLE_DOMAINS = 0x04, /* Contact handles need a domain portion. */
         ACC_FLAG_LOCAL_CONTACTS = 0x08, /* Contact list is local. */
+        ACC_FLAG_LOCKED = 0x10,         /* Account is locked (cannot be deleted, certain settings can't changed) */
 } account_flag_t;
 

protocols/bee.h

@@ -84 +84 @@
 } bee_user_t;
 
+typedef struct bee_chat_info {
+        char *title;
+        char *topic;
+} bee_chat_info_t;
+
 /* This one's mostly used so save space and make it easier (cheaper) to
    compare groups of contacts, etc. */
@@ -131 +136 @@
 
         void (*log)(bee_t *bee, const char *tag, const char *msg);
+        gboolean (*user_nick_change)(bee_t *bee, bee_user_t *bu, const char *hint);
 } bee_ui_funcs_t;
 
@@ -184 +190 @@
 G_MODULE_EXPORT void imcb_chat_invite(struct im_connection *ic, const char *name, const char *who, const char *msg);
 
+G_GNUC_DEPRECATED G_MODULE_EXPORT void bee_chat_list_finish(struct im_connection *ic);
+G_MODULE_EXPORT void imcb_chat_list_finish(struct im_connection *ic);
+G_MODULE_EXPORT void imcb_chat_list_free(struct im_connection *ic);
+
 #endif /* __BEE_H__ */

protocols/bee_chat.c

@@ -274 +274 @@
         }
 }
+
+void imcb_chat_list_finish(struct im_connection *ic)
+{
+        cmd_chat_list_finish(ic);
+}
+
+void bee_chat_list_finish(struct im_connection *ic)
+{
+        imcb_log(ic, "Warning: using deprecated bee_chat_list_finish. This will be removed in the stable release.");
+        imcb_chat_list_finish(ic);
+}
+
+void imcb_chat_list_free(struct im_connection *ic)
+{
+        bee_chat_info_t *ci;
+        GSList *l = ic->chatlist;
+
+        while (l) {
+                ci = l->data;
+                l = g_slist_delete_link(l, l);
+
+                g_free(ci->title);
+                g_free(ci->topic);
+                g_free(ci);
+        }
+
+        ic->chatlist = NULL;
+}

protocols/bee_ft.c

@@ -31 +31 @@
         bee_user_t *bu = bee_user_by_handle(bee, ic, handle);
 
-        if (bee->ui->ft_in_start) {
+        if (bee->ui->ft_in_start && bu) {
                 return bee->ui->ft_in_start(bee, bu, file_name, file_size);
         } else {

protocols/jabber/conference.c

@@ -28 +28 @@
 static xt_status jabber_chat_self_message(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password)
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks)
 {
         struct jabber_chat *jc;
@@ -57 +58 @@
                 g_free(jc);
                 return NULL;
+        }
+
+        if (always_use_nicks) {
+                jc->flags = JCFLAG_ALWAYS_USE_NICKS;
         }
 
@@ -95 +100 @@
         g_free(cserv);
 
-        c = jabber_chat_join(ic, rjid, jd->username, NULL);
+        c = jabber_chat_join(ic, rjid, jd->username, NULL, FALSE);
         g_free(rjid);
         if (c == NULL) {
@@ -244 +249 @@
 }
 
+static int jabber_chat_has_other_resources(struct im_connection *ic, struct jabber_buddy *bud)
+{
+        struct jabber_buddy *cur;
+
+        for (cur = jabber_buddy_by_jid(ic, bud->bare_jid, GET_BUDDY_FIRST); cur; cur = cur->next) {
+                if (cur != bud && jabber_compare_jid(cur->ext_jid, bud->ext_jid)) {
+                        return TRUE;
+                }
+        }
+        
+        return FALSE;
+}
+
 /* Not really the same syntax as the normal pkt_ functions, but this isn't
    called by the xmltree parser directly and this way I can add some extra
@@ -328 +346 @@
                         *s = 0; /* Should NEVER be NULL, but who knows... */
                 }
+
+                if (bud != jc->me && (jc->flags & JCFLAG_ALWAYS_USE_NICKS) && !(bud->flags & JBFLAG_IS_ANONYMOUS)) {
+                        imcb_buddy_nick_change(ic, bud->ext_jid, bud->resource);
+                }
+
                 imcb_chat_add_buddy(chat, bud->ext_jid);
                 if (s) {
@@ -333 +356 @@
                 }
         } else if (type) { /* type can only be NULL or "unavailable" in this function */
-                if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid) {
+                if ((bud->flags & JBFLAG_IS_CHATROOM) && bud->ext_jid && !jabber_chat_has_other_resources(ic, bud)) {
                         char *reason = NULL;
                         char *status = NULL;
@@ -443 +466 @@
 
         if (subject && chat) {
-                char *subject_text = subject->text_len > 0 ? subject->text : "";
+                char empty[1] = "";
+                char *subject_text = subject->text_len > 0 ? subject->text : empty;
                 if (g_strcmp0(chat->topic, subject_text) != 0) {
                         bare_jid = (bud) ? jabber_get_bare_jid(bud->ext_jid) : NULL;
@@ -479 +503 @@
                 bare_jid = jabber_get_bare_jid(bud->ext_jid ? bud->ext_jid : bud->full_jid);
                 final_from = bare_jid;
-                flags = (bud == jc->me) ? OPT_SELFMESSAGE : 0;
+                if (bud == jc->me || (g_strcasecmp(final_from, ic->acc->user) == 0)) {
+                        flags = OPT_SELFMESSAGE;
+                }
         } else {
                 final_from = nick;

protocols/jabber/iq.c

@@ -67 +67 @@
                         xt_add_child(reply, xt_new_node("name", set_getstr(&ic->acc->set, "user_agent"), NULL));
                         xt_add_child(reply, xt_new_node("version", BITLBEE_VERSION, NULL));
-                        xt_add_child(reply, xt_new_node("os", ARCH, NULL));
                 } else if (strcmp(s, XMLNS_TIME_OLD) == 0) {
                         time_t time_ep;
@@ -234 +233 @@
                 imcb_log(ic, "Warning: Received incomplete IQ packet while authenticating");
                 imc_logout(ic, FALSE);
-                return XT_HANDLED;
+                return XT_ABORT;
         }
 
@@ -287 +286 @@
                 imcb_log(ic, "Warning: Received incomplete IQ packet while authenticating");
                 imc_logout(ic, FALSE);
-                return XT_HANDLED;
+                return XT_ABORT;
         }
 
@@ -1060 +1059 @@
         return XT_HANDLED;
 }
+
+xt_status jabber_iq_disco_muc_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+
+int jabber_iq_disco_muc(struct im_connection *ic, const char *muc_server)
+{
+        struct xt_node *node;
+        int st;
+
+        node = xt_new_node("query", NULL, NULL);
+        xt_add_attr(node, "xmlns", XMLNS_DISCO_ITEMS);
+        node = jabber_make_packet("iq", "get", (char *) muc_server, node);
+
+        jabber_cache_add(ic, node, jabber_iq_disco_muc_response);
+        st = jabber_write_packet(ic, node);
+
+        return st;
+}
+
+xt_status jabber_iq_disco_muc_response(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
+{
+        struct xt_node *query, *c;
+        struct jabber_error *err;
+        GSList *rooms =  NULL;
+
+        if ((err = jabber_error_parse(xt_find_node(node->children, "error"), XMLNS_STANZA_ERROR))) {
+                imcb_error(ic, "The server replied with an error: %s%s%s",
+                           err->code, err->text ? ": " : "", err->text ? err->text : "");
+                jabber_error_free(err);
+                return XT_HANDLED;
+        }
+
+        if (!(query = xt_find_node(node->children, "query"))) {
+                imcb_error(ic, "Received incomplete MUC list reply");
+                return XT_HANDLED;
+        }
+
+        c = query->children;
+        while ((c = xt_find_node(c, "item"))) {
+                char *jid = xt_find_attr(c, "jid");
+
+                if (!jid || !strchr(jid, '@')) {
+                        c = c->next;
+                        continue;
+                }
+
+                bee_chat_info_t *ci = g_new(bee_chat_info_t, 1);
+                ci->title = g_strdup(xt_find_attr(c, "jid"));
+                ci->topic = g_strdup(xt_find_attr(c, "name"));
+                rooms = g_slist_prepend(rooms, ci);
+
+                c = c->next;
+        }
+
+        imcb_chat_list_free(ic);
+        ic->chatlist = g_slist_reverse(rooms);
+        imcb_chat_list_finish(ic);
+
+        return XT_HANDLED;
+}

protocols/jabber/jabber.c

@@ -82 +82 @@
         s->flags |= SET_NOSAVE | ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
+        set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
+
         if (strcmp(acc->prpl->name, "hipchat") == 0) {
                 set_setstr(&acc->set, "server", "chat.hipchat.com");
         } else {
-                set_add(&acc->set, "oauth", "false", set_eval_oauth, acc);
-
                 /* this reuses set_eval_oauth, which clears the password */
                 set_add(&acc->set, "anonymous", "false", set_eval_oauth, acc);
@@ -321 +321 @@
         struct jabber_data *jd = ic->proto_data;
 
+        imcb_chat_list_free(ic);
+
         while (jd->filetransfers) {
                 imcb_file_canceled(ic, (( struct jabber_transfer *) jd->filetransfers->data)->ft, "Logging out");
@@ -397 +399 @@
         if (g_strcasecmp(who, JABBER_OAUTH_HANDLE) == 0 &&
             !(jd->flags & OPT_LOGGED_IN) && jd->fd == -1) {
-                if (sasl_oauth2_get_refresh_token(ic, message)) {
+
+                if (jd->flags & JFLAG_HIPCHAT) {
+                        sasl_oauth2_got_token(ic, message, NULL, NULL);
+                        return 1;
+                } else if (sasl_oauth2_get_refresh_token(ic, message)) {
                         return 1;
                 } else {
@@ -577 +583 @@
         } else {
                 /* jabber_chat_join without the underscore is the conference.c one */
-                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"));
+                return jabber_chat_join(ic, room, final_nick, set_getstr(sets, "password"),
+                                        set_getbool(sets, "always_use_nicks"));
         }
 
@@ -586 +593 @@
 {
         return jabber_chat_with(ic, who);
+}
+
+static void jabber_chat_list_(struct im_connection *ic, const char *server)
+{
+        struct jabber_data *jd = ic->proto_data;
+
+        if (server && *server) {
+                jabber_iq_disco_muc(ic, server);
+        } else if (jd->muc_host && *jd->muc_host) {
+                jabber_iq_disco_muc(ic, jd->muc_host);
+        } else {
+                /* throw an error here, don't query conference.[server] directly.
+                 * for things like jabber.org it gets you 18000 results of garbage */
+                imcb_error(ic, "Please specify a server name such as `conference.%s'", jd->server);
+        }
 }
 
@@ -686 +708 @@
 void jabber_chat_add_settings(account_t *acc, set_t **head)
 {
+        set_add(head, "always_use_nicks", "false", set_eval_bool, NULL);
+
         /* Meh. Stupid room passwords. Not trying to obfuscate/hide
            them from the user for now. */
@@ -693 +717 @@
 void jabber_chat_free_settings(account_t *acc, set_t **head)
 {
+        set_del(head, "always_use_nicks");
+
         set_del(head, "password");
 }
@@ -759 +785 @@
         ret->chat_join = jabber_chat_join_;
         ret->chat_with = jabber_chat_with_;
+        ret->chat_list = jabber_chat_list_;
         ret->chat_add_settings = jabber_chat_add_settings;
         ret->chat_free_settings = jabber_chat_free_settings;

protocols/jabber/jabber.h

@@ -75 +75 @@
         JCFLAG_MESSAGE_SENT = 1,        /* Set this after sending the first message, so
                                            we can detect echoes/backlogs. */
+        JCFLAG_ALWAYS_USE_NICKS = 2,
 } jabber_chat_flags_t;
 
@@ -262 +263 @@
 void jabber_iq_version_send(struct im_connection *ic, struct jabber_buddy *bud, void *data);
 int jabber_iq_disco_server(struct im_connection *ic);
+int jabber_iq_disco_muc(struct im_connection *ic, const char *muc_server);
 
 /* si.c */
@@ -339 +341 @@
 int sasl_oauth2_get_refresh_token(struct im_connection *ic, const char *msg);
 int sasl_oauth2_refresh(struct im_connection *ic, const char *refresh_token);
+void sasl_oauth2_got_token(gpointer data, const char *access_token, const char *refresh_token, const char *error);
 
 extern const struct oauth2_service oauth2_service_google;
 
 /* conference.c */
-struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password);
+struct groupchat *jabber_chat_join(struct im_connection *ic, const char *room, const char *nick, const char *password,
+                                   gboolean always_use_nicks);
 struct groupchat *jabber_chat_with(struct im_connection *ic, char *who);
 struct groupchat *jabber_chat_by_jid(struct im_connection *ic, const char *name);

protocols/jabber/jabber_util.c

@@ -315 +315 @@
         int i;
 
+        if (!jid1 || !jid2) {
+                return FALSE;
+        }
+
         for (i = 0;; i++) {
                 if (jid1[i] == '\0' || jid1[i] == '/' || jid2[i] == '\0' || jid2[i] == '/') {

protocols/jabber/message.c

@@ -27 +27 @@
 {
         struct im_connection *ic = data;
-        struct jabber_data *jd = ic->proto_data;
         char *from = xt_find_attr(node, carbons_sent ? "to" : "from");
         char *type = xt_find_attr(node, "type");
@@ -38 +37 @@
         if (!from) {
                 return XT_HANDLED; /* Consider this packet corrupted. */
-        }
-
-        /* try to detect hipchat's own version of self-messages */
-        if (jd->flags & JFLAG_HIPCHAT) {
-                struct xt_node *c;
-
-                if ((c = xt_find_node_by_attr(node->children, "delay", "xmlns", XMLNS_DELAY)) &&
-                    (s = xt_find_attr(c, "from_jid")) &&
-                    jabber_compare_jid(s, jd->me)) {
-                        carbons_sent = TRUE;
-                }
         }
 

protocols/jabber/presence.c

@@ -222 +222 @@
         cap = xt_new_node("c", NULL, NULL);
         xt_add_attr(cap, "xmlns", XMLNS_CAPS);
-
-        if (jd->flags & JFLAG_HIPCHAT) {
-                /* hipchat specific node, whitelisted by request to receive self-messages */
-                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps/hipchat");
-        } else {
-                xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
-        }
+        xt_add_attr(cap, "node", "http://bitlbee.org/xmpp/caps");
         xt_add_attr(cap, "ver", BITLBEE_VERSION);   /* The XEP wants this hashed, but nobody's doing that. */
         xt_add_child(node, cap);

protocols/jabber/s5bytestream.c

@@ -928 +928 @@
                 proxy = next;
         }
+
+        g_free(proxysetting);
 }
 

protocols/jabber/sasl.c

@@ -39 +39 @@
 };
 
+/* """"""""""""""""""""""""""""""oauth"""""""""""""""""""""""""""""" */
+#define HIPCHAT_SO_CALLED_OAUTH_URL "https://hipchat.com/account/api"
+
 xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 {
@@ -45 +48 @@
         struct xt_node *c, *reply;
         char *s;
-        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_anonymous = 0;
+        int sup_plain = 0, sup_digest = 0, sup_gtalk = 0, sup_anonymous = 0, sup_hipchat_oauth = 0;
         int want_oauth = FALSE, want_hipchat = FALSE, want_anonymous = FALSE;
         GString *mechs;
@@ -80 +83 @@
                 } else if (c->text && g_strcasecmp(c->text, "X-OAUTH2") == 0) {
                         sup_gtalk = 1;
+                } else if (c->text && g_strcasecmp(c->text, "X-HIPCHAT-OAUTH2") == 0) {
+                        sup_hipchat_oauth = 1;
                 }
 
@@ -90 +95 @@
 
         if (!want_oauth && !sup_plain && !sup_digest) {
-                if (!sup_gtalk) {
+                if (sup_gtalk || sup_hipchat_oauth) {
                         imcb_error(ic, "This server requires OAuth "
                                    "(supported schemes:%s)", mechs->str);
@@ -110 +115 @@
         }
 
-        if (sup_gtalk && want_oauth) {
-                int len;
-
-                /* X-OAUTH2 is, not *the* standard OAuth2 SASL/XMPP implementation.
-                   It's currently used by GTalk and vaguely documented on
-                   http://code.google.com/apis/cloudprint/docs/rawxmpp.html . */
-                xt_add_attr(reply, "mechanism", "X-OAUTH2");
-
-                len = strlen(jd->username) + strlen(jd->oauth2_access_token) + 2;
-                s = g_malloc(len + 1);
-                s[0] = 0;
-                strcpy(s + 1, jd->username);
-                strcpy(s + 2 + strlen(jd->username), jd->oauth2_access_token);
-                reply->text = base64_encode((unsigned char *) s, len);
+        if ((sup_gtalk || sup_hipchat_oauth) && want_oauth) {
+                GString *gs;
+
+                gs = g_string_sized_new(128);
+
+                g_string_append_c(gs, '\0');
+
+                if (sup_gtalk) {
+                        /* X-OAUTH2 is not *the* standard OAuth2 SASL/XMPP implementation.
+                           It's currently used by GTalk and vaguely documented on
+                           http://code.google.com/apis/cloudprint/docs/rawxmpp.html */
+                        xt_add_attr(reply, "mechanism", "X-OAUTH2");
+
+                        g_string_append(gs, jd->username);
+                        g_string_append_c(gs, '\0');
+                        g_string_append(gs, jd->oauth2_access_token);
+                } else if (sup_hipchat_oauth) {
+                        /* Hipchat's variant, not standard either, is documented here:
+                           https://docs.atlassian.com/hipchat.xmpp/latest/xmpp/auth.html */
+                        xt_add_attr(reply, "mechanism", "oauth2");
+
+                        g_string_append(gs, jd->oauth2_access_token);
+                        g_string_append_c(gs, '\0');
+                        g_string_append(gs, set_getstr(&ic->acc->set, "resource"));
+                }
+
+                reply->text = base64_encode((unsigned char *) gs->str, gs->len);
                 reply->text_len = strlen(reply->text);
-                g_free(s);
+                g_string_free(gs, TRUE);
+
         } else if (want_oauth) {
                 imcb_error(ic, "OAuth requested, but not supported by server");
@@ -149 +168 @@
                 /* The rest will be done later, when we receive a <challenge/>. */
         } else if (sup_plain) {
-                int len;
                 GString *gs;
                 char *username;
@@ -174 +192 @@
                 }
 
-                len = gs->len;
-                s = g_string_free(gs, FALSE);
-
-                reply->text = base64_encode((unsigned char *) s, len);
+                reply->text = base64_encode((unsigned char *) gs->str, gs->len);
                 reply->text_len = strlen(reply->text);
-                g_free(s);
+                g_string_free(gs, TRUE);
         }
 
@@ -428 +443 @@
 {
         struct jabber_data *jd = ic->proto_data;
-        char *msg, *url;
 
         imcb_log(ic, "Starting OAuth authentication");
@@ -434 +448 @@
         /* Temporary contact, just used to receive the OAuth response. */
         imcb_add_buddy(ic, JABBER_OAUTH_HANDLE, NULL);
-        url = oauth2_url(jd->oauth2_service);
-        msg = g_strdup_printf("Open this URL in your browser to authenticate: %s", url);
-        imcb_buddy_msg(ic, JABBER_OAUTH_HANDLE, msg, 0, 0);
+
+        if (jd->flags & JFLAG_HIPCHAT) {
+                imcb_buddy_msg(ic, JABBER_OAUTH_HANDLE,
+                        "Open this URL and generate a token with 'View Group' and 'Send Message' scopes: "
+                        HIPCHAT_SO_CALLED_OAUTH_URL, 0, 0);
+        } else {
+                char *msg, *url;
+
+                url = oauth2_url(jd->oauth2_service);
+                msg = g_strdup_printf("Open this URL in your browser to authenticate: %s", url);
+                imcb_buddy_msg(ic, JABBER_OAUTH_HANDLE, msg, 0, 0);
+
+                g_free(msg);
+                g_free(url);
+        }
         imcb_buddy_msg(ic, JABBER_OAUTH_HANDLE, "Respond to this message with the returned "
                        "authorization token.", 0, 0);
 
-        g_free(msg);
-        g_free(url);
 }
 
@@ -453 +477 @@
         return FALSE;
 }
-
-static void sasl_oauth2_got_token(gpointer data, const char *access_token, const char *refresh_token,
-                                  const char *error);
 
 int sasl_oauth2_get_refresh_token(struct im_connection *ic, const char *msg)
@@ -486 +507 @@
 }
 
-static void sasl_oauth2_got_token(gpointer data, const char *access_token, const char *refresh_token, const char *error)
+void sasl_oauth2_got_token(gpointer data, const char *access_token, const char *refresh_token, const char *error)
 {
         struct im_connection *ic = data;

protocols/jabber/si.c

@@ -393 +393 @@
         struct jabber_transfer *tf = NULL;
         struct jabber_data *jd = ic->proto_data;
+        struct jabber_error *err;
 
         if (!(tgt_jid = xt_find_attr(node, "from")) ||
-            !(ini_jid = xt_find_attr(node, "to"))) {
+            !(ini_jid = xt_find_attr(node, "to")) ||
+            !(iq_id   = xt_find_attr(node, "id"))) {
                 imcb_log(ic, "Invalid SI response from=%s to=%s", tgt_jid, ini_jid);
+                return XT_HANDLED;
+        }
+
+        /* Let's see if we can find out what this bytestream should be for... */
+
+        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
+                struct jabber_transfer *tft = tflist->data;
+                if ((strcmp(tft->iq_id, iq_id) == 0)) {
+                        tf = tft;
+                        break;
+                }
+        }
+
+        if (!tf) {
+                imcb_log(ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid);
+                return XT_HANDLED;
+        }
+
+        err = jabber_error_parse(xt_find_node(node->children, "error"), XMLNS_STANZA_ERROR);
+
+        if (err) {
+                if (g_strcmp0(err->code, "forbidden") == 0) {
+                        imcb_log(ic, "File %s: %s rejected the transfer", tf->ft->file_name, tgt_jid);
+                } else {
+                        imcb_log(ic, "Error: Stream initiation request failed: %s (%s)", err->code, err->text);
+                }
+                imcb_file_canceled(ic, tf->ft, "Stream initiation request failed");
+                jabber_error_free(err);
                 return XT_HANDLED;
         }
@@ -409 +439 @@
          *                                      <value>
          */
-        if (!(tgt_jid = xt_find_attr(node, "from")) ||
-            !(ini_jid = xt_find_attr(node, "to")) ||
-            !(iq_id   = xt_find_attr(node, "id")) ||
-            !(c = xt_find_node(node->children, "si")) ||
+        if (!(c = xt_find_node(node->children, "si")) ||
             !(cmp = xt_find_attr(c, "xmlns")) ||
             !(strcmp(cmp, XMLNS_SI) == 0) ||
@@ -439 +466 @@
         }
 
-        /* Let's see if we can find out what this bytestream should be for... */
-
-        for (tflist = jd->filetransfers; tflist; tflist = g_slist_next(tflist)) {
-                struct jabber_transfer *tft = tflist->data;
-                if ((strcmp(tft->iq_id, iq_id) == 0)) {
-                        tf = tft;
-                        break;
-                }
-        }
-
-        if (!tf) {
-                imcb_log(ic, "WARNING: Received bytestream request from %s that doesn't match an SI request", ini_jid);
-                return XT_HANDLED;
-        }
-
         tf->ini_jid = g_strdup(ini_jid);
         tf->tgt_jid = g_strdup(tgt_jid);

protocols/nogaim.c

@@ -40 +40 @@
 
 #ifdef WITH_PLUGINS
+GList *plugins = NULL;
+
+static gint pluginscmp(gconstpointer a, gconstpointer b, gpointer data)
+{
+        const struct plugin_info *ia = a;
+        const struct plugin_info *ib = b;
+
+        return g_strcasecmp(ia->name, ib->name);
+}
+
 gboolean load_plugin(char *path)
 {
+        GList *l;
+        struct plugin_info *i;
+        struct plugin_info *info;
+        struct plugin_info * (*info_function) (void) = NULL;
         void (*init_function) (void);
 
         GModule *mod = g_module_open(path, G_MODULE_BIND_LAZY);
+        gboolean loaded = FALSE;
 
         if (!mod) {
-                log_message(LOGLVL_ERROR, "Can't find `%s', not loading (%s)\n", path, g_module_error());
+                log_message(LOGLVL_ERROR, "Error loading plugin `%s': %s\n", path, g_module_error());
                 return FALSE;
+        }
+
+        if (g_module_symbol(mod, "init_plugin_info", (gpointer *) &info_function)) {
+                info = info_function();
+
+                if (info->abiver != BITLBEE_ABI_VERSION_CODE) {
+                        log_message(LOGLVL_ERROR,
+                                    "`%s' uses ABI %u but %u is required\n",
+                                    path, info->abiver,
+                                    BITLBEE_ABI_VERSION_CODE);
+                        g_module_close(mod);
+                        return FALSE;
+                }
+
+                if (!info->name || !info->version) {
+                        log_message(LOGLVL_ERROR,
+                                    "Name or version missing from the "
+                                    "plugin info in `%s'\n", path);
+                        g_module_close(mod);
+                        return FALSE;
+                }
+
+                for (l = plugins; l; l = l->next) {
+                        i = l->data;
+
+                        if (g_strcasecmp(i->name, info->name) == 0) {
+                                loaded = TRUE;
+                                break;
+                        }
+                }
+
+                if (loaded) {
+                        log_message(LOGLVL_WARNING,
+                                    "%s plugin already loaded\n",
+                                    info->name);
+                        g_module_close(mod);
+                        return FALSE;
+                }
+        } else {
+                log_message(LOGLVL_WARNING, "Can't find function `init_plugin_info' in `%s'\n", path);
         }
 
         if (!g_module_symbol(mod, "init_plugin", (gpointer *) &init_function)) {
                 log_message(LOGLVL_WARNING, "Can't find function `init_plugin' in `%s'\n", path);
+                g_module_close(mod);
                 return FALSE;
         }
 
+        if (info_function) {
+                plugins = g_list_insert_sorted_with_data(plugins, info,
+                                                         pluginscmp, NULL);
+        }
+
         init_function();
-
         return TRUE;
 }
@@ -73 +133 @@
 
                 while ((entry = g_dir_read_name(dir))) {
+                        if (!g_str_has_suffix(entry, "." G_MODULE_SUFFIX)) {
+                                continue;
+                        }
+
                         path = g_build_filename(global.conf->plugindir, entry, NULL);
                         if (!path) {
@@ -86 +150 @@
                 g_dir_close(dir);
         }
+}
+
+GList *get_plugins()
+{
+        return plugins;
 }
 #endif
@@ -168 +237 @@
         load_plugins();
 #endif
+}
+
+GList *get_protocols()
+{
+        return protocols;
+}
+
+GList *get_protocols_disabled()
+{
+        return disabled_protocols;
 }
 
@@ -495 +574 @@
 }
 
-/* Mainly meant for ICQ (and now also for Jabber conferences) to allow IM
-   modules to suggest a nickname for a handle. */
-void imcb_buddy_nick_hint(struct im_connection *ic, const char *handle, const char *nick)
+/* Implements either imcb_buddy_nick_hint() or imcb_buddy_nick_change() depending on the value of 'change' */
+static void buddy_nick_hint_or_change(struct im_connection *ic, const char *handle, const char *nick, gboolean change)
 {
         bee_t *bee = ic->bee;
@@ -509 +587 @@
         bu->nick = g_strdup(nick);
 
-        if (bee->ui->user_nick_hint) {
+        if (change && bee->ui->user_nick_change) {
+                bee->ui->user_nick_change(bee, bu, nick);
+        } else if (!change && bee->ui->user_nick_hint) {
                 bee->ui->user_nick_hint(bee, bu, nick);
         }
+}
+
+/* Soft variant, for newly created users. Does nothing if it's already online */
+void imcb_buddy_nick_hint(struct im_connection *ic, const char *handle, const char *nick)
+{
+        buddy_nick_hint_or_change(ic, handle, nick, FALSE);
+}
+
+/* Hard variant, always changes the nick */
+void imcb_buddy_nick_change(struct im_connection *ic, const char *handle, const char *nick)
+{
+        buddy_nick_hint_or_change(ic, handle, nick, TRUE);
 }
 
@@ -667 +759 @@
         if (away && *away) {
                 GList *m = ic->acc->prpl->away_states(ic);
+                if (m == NULL) {
+                        return 0;
+                }
                 msg = ic->acc->flags & ACC_FLAG_AWAY_MESSAGE ? away : NULL;
                 away = imc_away_state_find(m, away, &msg) ? :

protocols/nogaim.h

@@ -102 +102 @@
 
         GSList *groupchats;
+        GSList *chatlist;
 };
 
@@ -144 +145 @@
         char *description;
 };
+
+/* This enum takes a few things from libpurple and a few things from old OPT_ flags.
+ * The only flag that was used before this struct was PRPL_OPT_NOOTR.
+ *
+ * The libpurple ones only use the same values as the PurpleProtocolOptions
+ * enum for convenience, but there's no promise of direct compatibility with
+ * those values. As of libpurple 2.8.0 they use up to 0x800 (1 << 11), which is
+ * a nice coincidence.
+ */
+typedef enum {
+        /* The protocol doesn't use passwords
+         * Mirrors libpurple's OPT_PROTO_NO_PASSWORD */
+        PRPL_OPT_NO_PASSWORD = 1 << 4,
+
+        /* The protocol doesn't require passwords, but may use them
+         * Mirrors libpurple's OPT_PROTO_PASSWORD_OPTIONAL */
+        PRPL_OPT_PASSWORD_OPTIONAL = 1 << 7,
+
+        /* The protocol is not suitable for OTR, see OPT_NOOTR */
+        PRPL_OPT_NOOTR = 1 << 12,
+} prpl_options_t;
 
 struct prpl {
@@ -269 +291 @@
         gboolean (* handle_is_self) (struct im_connection *, const char *who);
 
+        /* This sets/updates the im_connection->chatlist field with a
+         * bee_chat_info_t GSList. This function should ensure the
+         * bee_chat_list_finish() function gets called at some point
+         * after the chat list is completely updated.
+         */
+        void (* chat_list) (struct im_connection *, const char *server);
+
         /* Some placeholders so eventually older plugins may cooperate with newer BitlBees. */
         void *resv1;
@@ -277 +306 @@
 };
 
+struct plugin_info
+{
+        guint abiver;
+        const char *name;
+        const char *version;
+        const char *description;
+        const char *author;
+        const char *url;
+};
+
+#ifdef WITH_PLUGINS
+G_MODULE_EXPORT GList *get_plugins();
+#endif
+
 /* im_api core stuff. */
 void nogaim_init();
+G_MODULE_EXPORT GList *get_protocols();
+G_MODULE_EXPORT GList *get_protocols_disabled();
 G_MODULE_EXPORT GSList *get_connections();
 G_MODULE_EXPORT struct prpl *find_protocol(const char *name);
@@ -330 +375 @@
 G_MODULE_EXPORT void imcb_rename_buddy(struct im_connection *ic, const char *handle, const char *realname);
 G_MODULE_EXPORT void imcb_buddy_nick_hint(struct im_connection *ic, const char *handle, const char *nick);
+G_MODULE_EXPORT void imcb_buddy_nick_change(struct im_connection *ic, const char *handle, const char *nick);
 G_MODULE_EXPORT void imcb_buddy_action_response(bee_user_t *bu, const char *action, char * const args[], void *data);
 G_MODULE_EXPORT GSList *imcb_get_local_contacts(struct im_connection *ic);

protocols/oscar/conn.c

@@ -383 +383 @@
 {
         aim_conn_t *connstruct;
-        guint16 port = AIM_LOGIN_PORT;
-        char *host;
-        int i;
 
         if (!(connstruct = aim_conn_getnext(sess))) {
@@ -400 +397 @@
         }
 
-        /*
-         * As of 23 Jul 1999, AOL now sends the port number, preceded by a
-         * colon, in the BOS redirect.  This fatally breaks all previous
-         * libfaims.  Bad, bad AOL.
-         *
-         * We put this here to catch every case.
-         *
-         */
-
-        for (i = 0; i < (int) strlen(dest); i++) {
-                if (dest[i] == ':') {
-                        port = atoi(&(dest[i + 1]));
-                        break;
-                }
-        }
-
-        host = (char *) g_malloc(i + 1);
-        strncpy(host, dest, i);
-        host[i] = '\0';
-
-        connstruct->fd = proxy_connect(host, port, NULL, NULL);
-
-        g_free(host);
+        /* The code that used to be here was very broken */
+        g_return_val_if_reached(connstruct);
 
         return connstruct;

protocols/purple/bpurple.h

@@ -13 +13 @@
     GHashTable *input_requests;
     guint next_request_id;
+    char *chat_list_server;
+    GSList *filetransfers;
 };
 

protocols/purple/ft.c

@@ -42 +42 @@
         char *fn, *handle;
         gboolean ui_wants_data;
+        int timeout;
 };
 
@@ -64 +65 @@
         struct prpl_xfer_data *px = ft->data;
 
-        purple_xfer_request_denied(px->xfer);
+        if (px->xfer) {
+                if (!purple_xfer_is_completed(px->xfer) && !purple_xfer_is_canceled(px->xfer)) {
+                        purple_xfer_cancel_local(px->xfer);
+                }
+                px->xfer->ui_data = NULL;
+                purple_xfer_unref(px->xfer);
+                px->xfer = NULL;
+        }
+}
+
+static void prpl_xfer_free(struct file_transfer *ft)
+{
+        struct prpl_xfer_data *px = ft->data;
+        struct purple_data *pd = px->ic->proto_data;
+
+        pd->filetransfers = g_slist_remove(pd->filetransfers, px);
+
+        if (px->xfer) {
+                px->xfer->ui_data = NULL;
+                purple_xfer_unref(px->xfer);
+        }
+
+        if (px->timeout) {
+                b_event_remove(px->timeout);
+        }
+
+        g_free(px->fn);
+        g_free(px->handle);
+        if (px->fd >= 0) {
+                close(px->fd);
+        }
+        g_free(px);
 }
 
 static void prplcb_xfer_new(PurpleXfer *xfer)
 {
+        purple_xfer_ref(xfer);
+
         if (purple_xfer_get_type(xfer) == PURPLE_XFER_RECEIVE) {
                 struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
+                struct purple_data *pd;
 
                 xfer->ui_data = px;
@@ -77 +112 @@
                 px->fd = -1;
                 px->ic = purple_ic_by_pa(xfer->account);
+
+                pd = px->ic->proto_data;
+                pd->filetransfers = g_slist_prepend(pd->filetransfers, px);
 
                 purple_xfer_set_local_filename(xfer, px->fn);
@@ -112 +150 @@
         px->ft->accept = prpl_xfer_accept;
         px->ft->canceled = prpl_xfer_canceled;
+        px->ft->free = prpl_xfer_free;
         px->ft->write_request = prpl_xfer_write_request;
 
@@ -164 +203 @@
 
 
-/* Generic (IM<>UI): */
 static void prplcb_xfer_destroy(PurpleXfer *xfer)
 {
         struct prpl_xfer_data *px = xfer->ui_data;
 
-        g_free(px->fn);
-        g_free(px->handle);
-        if (px->fd >= 0) {
-                close(px->fd);
-        }
-        g_free(px);
+        if (px) {
+                px->xfer = NULL;
+        }
 }
 
@@ -224 +259 @@
         struct prpl_xfer_data *px = xfer->ui_data;
 
-        if (px->ft) {
+        if (px && px->ft) {
                 imcb_file_canceled(px->ic, px->ft, "Canceled by remote end");
-        } else {
+        } else if (px) {
                 /* px->ft == NULL for sends, because of the two stages. :-/ */
                 imcb_error(px->ic, "File transfer cancelled by remote end");
@@ -240 +275 @@
 {
         struct prpl_xfer_data *px = g_new0(struct prpl_xfer_data, 1);
+        struct purple_data *pd;
         char *dir, *basename;
 
         ft->data = px;
         px->ft = ft;
+        px->ft->free = prpl_xfer_free;
 
         dir = g_strdup("/tmp/bitlbee-purple-ft.XXXXXX");
@@ -272 +309 @@
         px->handle = g_strdup(handle);
 
+        pd = px->ic->proto_data;
+        pd->filetransfers = g_slist_prepend(pd->filetransfers, px);
+
         imcb_log(ic,
                  "Due to libpurple limitations, the file has to be cached locally before proceeding with the actual file transfer. Please wait...");
 
-        b_timeout_add(0, purple_transfer_request_cb, ft);
+        px->timeout = b_timeout_add(0, purple_transfer_request_cb, ft);
 }
 
@@ -295 +335 @@
         struct prpl_xfer_data *px = ft->data;
 
+        px->timeout = 0;
+
         if (ft->write == NULL) {
                 ft->write = prpl_xfer_write;
@@ -322 +364 @@
                 px->ft = NULL;
         } else {
-                b_timeout_add(0, purple_transfer_request_cb, ft);
+                px->timeout = b_timeout_add(0, purple_transfer_request_cb, ft);
         }
 
         return TRUE;
+}
+
+void purple_transfer_cancel_all(struct im_connection *ic)
+{
+        struct purple_data *pd = ic->proto_data;
+
+        while (pd->filetransfers) {
+                struct prpl_xfer_data *px = pd->filetransfers->data;
+
+                if (px->ft) {
+                        imcb_file_canceled(ic, px->ft, "Logging out");
+                }
+
+                pd->filetransfers = g_slist_remove(pd->filetransfers, px);
+        }
 }
 

protocols/purple/purple.c

@@ -43 +43 @@
                                    const char *message, const char *who);
 
+void purple_transfer_cancel_all(struct im_connection *ic);
+
 /* purple_request_input specific stuff */
 typedef void (*ri_callback_t)(gpointer, const gchar *);
@@ -54 +56 @@
 };
 
+struct purple_roomlist_data {
+        GSList *chats;
+        gint topic;
+        gboolean initialized;
+};
+
+
 struct im_connection *purple_ic_by_pa(PurpleAccount *pa)
 {
@@ -94 +103 @@
 }
 
+static char *purple_get_account_prpl_id(account_t *acc)
+{
+        /* "oscar" is how non-purple bitlbee calls it,
+         * and it might be icq or aim, depending on the username */
+        if (g_strcmp0(acc->prpl->name, "oscar") == 0) {
+                return (g_ascii_isdigit(acc->user[0])) ? "prpl-icq" : "prpl-aim";
+        }
+
+        return acc->prpl->data;
+}
+
 static void purple_init(account_t *acc)
 {
-        PurplePlugin *prpl = purple_plugins_find_with_id((char *) acc->prpl->data);
+        char *prpl_id = purple_get_account_prpl_id(acc);
+        PurplePlugin *prpl = purple_plugins_find_with_id(prpl_id);
         PurplePluginProtocolInfo *pi = prpl->info->extra_info;
         PurpleAccount *pa;
@@ -262 +283 @@
         /* Go through all away states to figure out if away/status messages
            are possible. */
-        pa = purple_account_new(acc->user, (char *) acc->prpl->data);
+        pa = purple_account_new(acc->user, prpl_id);
         for (st = purple_account_get_status_types(pa); st; st = st->next) {
                 PurpleStatusPrimitive prim = purple_status_type_get_primitive(st->data);
@@ -345 +366 @@
 
         ic->proto_data = pd = g_new0(struct purple_data, 1);
-        pd->account = purple_account_new(acc->user, (char *) acc->prpl->data);
+        pd->account = purple_account_new(acc->user, purple_get_account_prpl_id(acc));
         pd->input_requests = g_hash_table_new_full(g_direct_hash, g_direct_equal,
                                                    NULL, g_free);
@@ -371 +392 @@
         }
 
+        if (pd->filetransfers) {
+                purple_transfer_cancel_all(ic);
+        }
+
         purple_account_set_enabled(pd->account, "BitlBee", FALSE);
         purple_connections = g_slist_remove(purple_connections, ic);
         purple_accounts_remove(pd->account);
+        imcb_chat_list_free(ic);
+        g_free(pd->chat_list_server);
         g_hash_table_destroy(pd->input_requests);
         g_free(pd);
@@ -673 +700 @@
 }
 
+void purple_chat_set_topic(struct groupchat *gc, char *topic)
+{
+        PurpleConversation *pc = gc->data;
+        PurpleConvChat *pcc = PURPLE_CONV_CHAT(pc);
+        struct purple_data *pd = gc->ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+
+        if (pi->set_chat_topic) {
+                pi->set_chat_topic(purple_account_get_connection(pd->account),
+                                   purple_conv_chat_get_id(pcc),
+                                   topic);
+        }
+}
+
 void purple_chat_kick(struct groupchat *gc, char *who, const char *message)
 {
@@ -697 +739 @@
         GHashTable *chat_hash;
         PurpleConversation *conv;
+        struct groupchat *gc;
         GList *info, *l;
 
@@ -730 +773 @@
         g_list_free(info);
 
+        /* do this before serv_join_chat to handle cases where prplcb_conv_new is called immediately (not async) */
+        gc = imcb_chat_new(ic, room);
+
         serv_join_chat(purple_account_get_connection(pd->account), chat_hash);
 
         g_hash_table_destroy(chat_hash);
 
-        return imcb_chat_new(ic, room);
+        return gc;
+}
+
+void purple_chat_list(struct im_connection *ic, const char *server)
+{
+        PurpleRoomlist *list;
+        struct purple_data *pd = ic->proto_data;
+        PurplePlugin *prpl = purple_plugins_find_with_id(pd->account->protocol_id);
+        PurplePluginProtocolInfo *pi = prpl->info->extra_info;
+
+        if (!pi || !pi->roomlist_get_list) {
+                imcb_log(ic, "Room listing unsupported by this purple plugin");
+                return;
+        }
+
+        g_free(pd->chat_list_server);
+        pd->chat_list_server = (server && *server) ? g_strdup(server) : NULL;
+
+        list = purple_roomlist_get_list(pd->account->gc);
+
+        if (list) {
+                struct purple_roomlist_data *rld = list->ui_data;
+                rld->initialized = TRUE;
+
+                purple_roomlist_ref(list);
+        }
 }
 
@@ -970 +1041 @@
 
 /* Generic handler for IM or chat messages, covers write_chat, write_im and write_conv */
-static void handle_conv_msg(PurpleConversation *conv, const char *who, const char *message, guint32 bee_flags, time_t mtime)
+static void handle_conv_msg(PurpleConversation *conv, const char *who, const char *message_, guint32 bee_flags, time_t mtime)
 {
         struct im_connection *ic = purple_ic_by_pa(conv->account);
         struct groupchat *gc = conv->ui_data;
+        char *message = g_strdup(message_);
         PurpleBuddy *buddy;
 
@@ -982 +1054 @@
 
         if (conv->type == PURPLE_CONV_TYPE_IM) {
-                imcb_buddy_msg(ic, (char *) who, (char *) message, bee_flags, mtime);
+                imcb_buddy_msg(ic, who, message, bee_flags, mtime);
         } else if (gc) {
-                imcb_chat_msg(gc, who, (char *) message, bee_flags, mtime);
-        }
+                imcb_chat_msg(gc, who, message, bee_flags, mtime);
+        }
+
+        g_free(message);
 }
 
@@ -1171 +1245 @@
         struct im_connection *ic = purple_ic_by_pa(account);
         struct purple_data *pd = ic->proto_data;
-        struct request_input_data *ri = g_new0(struct request_input_data, 1);
-        guint id = pd->next_request_id++;
+        struct request_input_data *ri;
+        guint id;
+
+        /* hack so that jabber's chat list doesn't ask for conference server twice */
+        if (pd->chat_list_server && title && g_strcmp0(title, "Enter a Conference Server") == 0) {
+                ((ri_callback_t) ok_cb)(user_data, pd->chat_list_server);
+                g_free(pd->chat_list_server);
+                pd->chat_list_server = NULL;
+                return NULL;
+        }
+
+        id = pd->next_request_id++;
+        ri = g_new0(struct request_input_data, 1);
 
         ri->id = id;
@@ -1182 +1267 @@
 
         imcb_add_buddy(ic, ri->buddy, NULL);
-        imcb_buddy_msg(ic, ri->buddy, secondary, 0, 0);
+
+        if (title && *title) {
+                imcb_buddy_msg(ic, ri->buddy, title, 0, 0);
+        }
+
+        if (primary && *primary) {
+                imcb_buddy_msg(ic, ri->buddy, primary, 0, 0);
+        }
+
+        if (secondary && *secondary) {
+                imcb_buddy_msg(ic, ri->buddy, secondary, 0, 0);
+        }
 
         return ri;
@@ -1256 +1352 @@
         prplcb_privacy_deny_added,         /* deny_added */
         prplcb_privacy_deny_removed,       /* deny_removed */
+};
+
+static void prplcb_roomlist_create(PurpleRoomlist *list)
+{
+        struct purple_roomlist_data *rld;
+
+        list->ui_data = rld = g_new0(struct purple_roomlist_data, 1);
+        rld->topic = -1;
+}
+
+static void prplcb_roomlist_set_fields(PurpleRoomlist *list, GList *fields)
+{
+        gint topic = -1;
+        GList *l;
+        guint i;
+        PurpleRoomlistField *field;
+        struct purple_roomlist_data *rld = list->ui_data;
+
+        for (i = 0, l = fields; l; i++, l = l->next) {
+                field = l->data;
+
+                /* Use the first visible string field as a fallback topic */
+                if (i != 0 && topic < 0 && !field->hidden &&
+                    field->type == PURPLE_ROOMLIST_FIELD_STRING) {
+                        topic = i;
+                }
+
+                if ((g_strcasecmp(field->name, "description") == 0) ||
+                    (g_strcasecmp(field->name, "topic") == 0)) {
+                        if (field->type == PURPLE_ROOMLIST_FIELD_STRING) {
+                                rld->topic = i;
+                        }
+                }
+        }
+
+        if (rld->topic < 0) {
+                rld->topic = topic;
+        }
+}
+
+static void prplcb_roomlist_add_room(PurpleRoomlist *list, PurpleRoomlistRoom *room)
+{
+        bee_chat_info_t *ci;
+        const char *title;
+        const char *topic;
+        GList *fields;
+        struct purple_roomlist_data *rld = list->ui_data;
+
+        fields = purple_roomlist_room_get_fields(room);
+        title = purple_roomlist_room_get_name(room);
+
+        if (rld->topic >= 0) {
+                topic = g_list_nth_data(fields, rld->topic);
+        } else {
+                topic = NULL;
+        }
+
+        ci = g_new(bee_chat_info_t, 1);
+        ci->title = g_strdup(title);
+        ci->topic = g_strdup(topic);
+        rld->chats = g_slist_prepend(rld->chats, ci);
+}
+
+static void prplcb_roomlist_in_progress(PurpleRoomlist *list, gboolean in_progress)
+{
+        struct im_connection *ic;
+        struct purple_data *pd;
+        struct purple_roomlist_data *rld = list->ui_data;
+
+        if (in_progress || !rld) {
+                return;
+        }
+
+        ic = purple_ic_by_pa(list->account);
+        imcb_chat_list_free(ic);
+
+        pd = ic->proto_data;
+        g_free(pd->chat_list_server);
+        pd->chat_list_server = NULL;
+
+        ic->chatlist = g_slist_reverse(rld->chats);
+        rld->chats = NULL;
+
+        imcb_chat_list_finish(ic);
+
+        if (rld->initialized) {
+                purple_roomlist_unref(list);
+        }
+}
+
+static void prplcb_roomlist_destroy(PurpleRoomlist *list)
+{
+        g_free(list->ui_data);
+        list->ui_data = NULL;
+}
+
+static PurpleRoomlistUiOps bee_roomlist_uiops =
+{
+        NULL,                         /* show_with_account */
+        prplcb_roomlist_create,       /* create */
+        prplcb_roomlist_set_fields,   /* set_fields */
+        prplcb_roomlist_add_room,     /* add_room */
+        prplcb_roomlist_in_progress,  /* in_progress */
+        prplcb_roomlist_destroy,      /* destroy */
 };
 
@@ -1422 +1622 @@
         purple_request_set_ui_ops(&bee_request_uiops);
         purple_privacy_set_ui_ops(&bee_privacy_uiops);
+        purple_roomlist_set_ui_ops(&bee_roomlist_uiops);
         purple_notify_set_ui_ops(&bee_notify_uiops);
         purple_accounts_set_ui_ops(&bee_account_uiops);
@@ -1438 +1639 @@
         char *dir;
 
+        if (purple_get_core() != NULL) {
+                log_message(LOGLVL_ERROR, "libpurple already initialized. "
+                            "Please use inetd or ForkDaemon mode instead.");
+                return;
+        }
+
         g_assert((int) B_EV_IO_READ == (int) PURPLE_INPUT_READ);
         g_assert((int) B_EV_IO_WRITE == (int) PURPLE_INPUT_WRITE);
@@ -1443 +1650 @@
         dir = g_strdup_printf("%s/purple", global.conf->configdir);
         purple_util_set_user_dir(dir);
+        g_free(dir);
+
+        dir = g_strdup_printf("%s/purple", global.conf->plugindir);
+        purple_plugins_add_search_path(dir);
         g_free(dir);
 
@@ -1506 +1717 @@
         funcs.chat_with = purple_chat_with;
         funcs.chat_invite = purple_chat_invite;
+        funcs.chat_topic = purple_chat_set_topic;
         funcs.chat_kick = purple_chat_kick;
         funcs.chat_leave = purple_chat_leave;
         funcs.chat_join = purple_chat_join;
+        funcs.chat_list = purple_chat_list;
         funcs.transfer_request = purple_transfer_request;
 
@@ -1517 +1730 @@
         for (prots = purple_plugins_get_protocols(); prots; prots = prots->next) {
                 PurplePlugin *prot = prots->data;
+                PurplePluginProtocolInfo *pi = prot->info->extra_info;
                 struct prpl *ret;
 
@@ -1530 +1744 @@
                         ret->name += 5;
                 }
+
+                if (pi->options & OPT_PROTO_NO_PASSWORD) {
+                        ret->options |= PRPL_OPT_NO_PASSWORD;
+                }
+
+                if (pi->options & OPT_PROTO_PASSWORD_OPTIONAL) {
+                        ret->options |= PRPL_OPT_PASSWORD_OPTIONAL;
+                }
+
                 register_protocol(ret);
 
@@ -1539 +1762 @@
                         ret = g_memdup(&funcs, sizeof(funcs));
                         ret->name = "oscar";
-                        ret->data = prot->info->id;
+                        /* purple_get_account_prpl_id() determines the actual protocol ID (icq/aim) */
+                        ret->data = NULL;
                         register_protocol(ret);
                 }

protocols/skype/skype.c

@@ -1763 +1763 @@
         register_protocol(ret);
 }
+
+struct plugin_info *init_plugin_info(void)
+{
+        static struct plugin_info info = {
+                BITLBEE_ABI_VERSION_CODE,
+                "skype",
+                BITLBEE_VERSION,
+                "Skype protocol plugin",
+                NULL,
+                NULL
+        };
+
+        return &info;
+}

protocols/twitter/twitter.c

@@ -345 +345 @@
                 imcb_log(ic, "Getting contact list");
                 twitter_get_friends_ids(ic, -1);
+                twitter_get_mutes_ids(ic, -1);
+                twitter_get_noretweets_ids(ic, -1);
         } else {
                 twitter_main_loop_start(ic);
@@ -469 +471 @@
         g_regex_match(regex, msg, 0, &match_info);
         while (g_match_info_matches(match_info)) {
-                gchar *s, *url;
+                gchar *url;
 
                 url = g_match_info_fetch(match_info, 2);
                 url_len_diff += target_len - g_utf8_strlen(url, -1);
 
-                /* Add another character for https://t.co/... URLs */
-                if ((s = g_match_info_fetch(match_info, 3))) {
-                        url_len_diff += 1;
-                        g_free(s);
-                }
                 g_free(url);
                 g_match_info_next(match_info, NULL);
@@ -541 +538 @@
         if (strcmp(acc->prpl->name, "twitter") == 0) {
                 def_url = TWITTER_API_URL;
-                def_tul = "22";
+                def_tul = "23";
                 def_mentions = "true";
         } else {                /* if( strcmp( acc->prpl->name, "identica" ) == 0 ) */
@@ -690 +687 @@
                 }
 
+                g_slist_foreach(td->mutes_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->mutes_ids);
+
+                g_slist_foreach(td->noretweets_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->noretweets_ids);
+
                 http_close(td->stream);
                 twitter_filter_remove_all(ic);
@@ -948 +951 @@
         } else if ((g_strcasecmp(cmd[0], "favourite") == 0 ||
                     g_strcasecmp(cmd[0], "favorite") == 0 ||
-                    g_strcasecmp(cmd[0], "fav") == 0) && cmd[1]) {
+                    g_strcasecmp(cmd[0], "fav") == 0 ||
+                    g_strcasecmp(cmd[0], "like") == 0) && cmd[1]) {
                 if ((id = twitter_message_id_from_command_arg(ic, cmd[1], NULL))) {
                         twitter_favourite_tweet(ic, id);
@@ -960 +964 @@
         } else if (g_strcasecmp(cmd[0], "unfollow") == 0 && cmd[1]) {
                 twitter_remove_buddy(ic, cmd[1], NULL);
+                goto eof;
+        } else if (g_strcasecmp(cmd[0], "mute") == 0 && cmd[1]) {
+                twitter_mute_create_destroy(ic, cmd[1], 1);
+                goto eof;
+        } else if (g_strcasecmp(cmd[0], "unmute") == 0 && cmd[1]) {
+                twitter_mute_create_destroy(ic, cmd[1], 0);
                 goto eof;
         } else if ((g_strcasecmp(cmd[0], "report") == 0 ||
@@ -1082 +1092 @@
         struct prpl *ret = g_new0(struct prpl, 1);
 
-        ret->options = OPT_NOOTR;
+        ret->options = PRPL_OPT_NOOTR | PRPL_OPT_NO_PASSWORD;
         ret->name = "twitter";
         ret->login = twitter_login;
@@ -1109 +1119 @@
         ret = g_memdup(ret, sizeof(struct prpl));
         ret->name = "identica";
+        ret->options =  PRPL_OPT_NOOTR;
         register_protocol(ret);
 }

protocols/twitter/twitter.h

@@ -61 +61 @@
 
         GSList *follow_ids;
+        GSList *mutes_ids;
+        GSList *noretweets_ids;
         GSList *filters;
 

protocols/twitter/twitter_http.c

@@ -79 +79 @@
         g_string_printf(request, "%s %s%s%s%s HTTP/1.1\r\n"
                         "Host: %s\r\n"
-                        "User-Agent: BitlBee " BITLBEE_VERSION " " ARCH "/" CPU "\r\n",
+                        "User-Agent: BitlBee " BITLBEE_VERSION "\r\n",
                         is_post ? "POST" : "GET",
                         base_url ? base_url->file : td->url_path,

protocols/twitter/twitter_lib.c

@@ -245 +245 @@
 
 static void twitter_http_get_friends_ids(struct http_request *req);
+static void twitter_http_get_mutes_ids(struct http_request *req);
+static void twitter_http_get_noretweets_ids(struct http_request *req);
 
 /**
@@ -257 +259 @@
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         twitter_http(ic, TWITTER_FRIENDS_IDS_URL, twitter_http_get_friends_ids, ic, 0, args, 2);
+
+        g_free(args[1]);
+}
+
+/**
+ * Get the muted users ids.
+ */
+void twitter_get_mutes_ids(struct im_connection *ic, gint64 next_cursor)
+{
+        char *args[2];
+
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
+        twitter_http(ic, TWITTER_MUTES_IDS_URL, twitter_http_get_mutes_ids, ic, 0, args, 2);
+
+        g_free(args[1]);
+}
+
+/**
+ * Get the ids for users from whom we should ignore retweets.
+ */
+void twitter_get_noretweets_ids(struct im_connection *ic, gint64 next_cursor)
+{
+        char *args[2];
+
+        args[0] = "cursor";
+        args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
+        twitter_http(ic, TWITTER_NORETWEETS_IDS_URL, twitter_http_get_noretweets_ids, ic, 0, args, 2);
 
         g_free(args[1]);
@@ -334 +364 @@
                 twitter_get_users_lookup(ic);
         }
+
+        txl->list = NULL;
+        txl_free(txl);
+}
+
+/**
+ * Callback for getting the mutes ids.
+ */
+static void twitter_http_get_mutes_ids(struct http_request *req)
+{
+        struct im_connection *ic = req->data;
+        JSON_Value *parsed;
+        struct twitter_xml_list *txl;
+        struct twitter_data *td;
+
+        // Check if the connection is stil active
+        if (!g_slist_find(twitter_connections, ic)) {
+                return;
+        }
+
+        td = ic->proto_data;
+
+        if (req->status_code != 200) {
+                /* Fail silently */
+                return;
+        }
+
+        // Parse the data.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = td->mutes_ids;
+
+        /* mute ids API response is similar enough to friends response
+           to reuse this method */
+        twitter_xt_get_friends_id_list(parsed, txl);
+        json_value_free(parsed);
+
+        td->mutes_ids = txl->list;
+        if (txl->next_cursor) {
+                /* Recurse while there are still more pages */
+                twitter_get_mutes_ids(ic, txl->next_cursor);
+        }
+
+        txl->list = NULL;
+        txl_free(txl);
+}
+
+/**
+ * Callback for getting the no-retweets ids.
+ */
+static void twitter_http_get_noretweets_ids(struct http_request *req)
+{
+        struct im_connection *ic = req->data;
+        JSON_Value *parsed;
+        struct twitter_xml_list *txl;
+        struct twitter_data *td;
+
+        // Check if the connection is stil active
+        if (!g_slist_find(twitter_connections, ic)) {
+                return;
+        }
+
+        if (req->status_code != 200) {
+                /* Fail silently */
+                return;
+        }
+
+        td = ic->proto_data;
+
+        // Parse the data.
+        if (!(parsed = twitter_parse_response(ic, req))) {
+                return;
+        }
+
+        txl = g_new0(struct twitter_xml_list, 1);
+        txl->list = td->noretweets_ids;
+        
+        // Process the retweet ids
+        txl->type = TXL_ID;
+        if (json_type(parsed) == JSONArray) {
+                JSON_Array *arr = json_array(parsed);
+                unsigned int i;
+                for (i = 0; i < json_array_get_count(arr); i++) {
+                        jint id = json_array_get_integer(arr, i);
+                        txl->list = g_slist_prepend(txl->list,
+                                                    g_strdup_printf("%lld", id));
+                }
+        }
+
+        json_value_free(parsed);
+        td->noretweets_ids = txl->list;
 
         txl->list = NULL;
@@ -467 +591 @@
 #endif
 
-static void expand_entities(char **text, const JSON_Object *node);
+static void expand_entities(char **text, const JSON_Object *node, const JSON_Object *extended_node);
 
 /**
@@ -479 +603 @@
 static struct twitter_xml_status *twitter_xt_get_status(const JSON_Object *node)
 {
-        struct twitter_xml_status *txs;
+        struct twitter_xml_status *txs = {0};
         const JSON_Object *rt = NULL;
+        const JSON_Value *text_value = NULL;
+        const JSON_Object *extended_node = NULL;
 
         if (!node) {
@@ -488 +614 @@
 
         JSON_O_FOREACH(node, k, v) {
-                if (strcmp("text", k) == 0 && (txs->text = g_strdup(json_string(v)))) {
-                        // TODO: Huh strip html? In json? Not sure whether I have to..
-                        strip_html(txs->text);
+                if (strcmp("text", k) == 0 && json_type(v) == JSONString && text_value == NULL) {
+                        text_value = v;
+                } else if (strcmp("full_text", k) == 0 && json_type(v) == JSONString) {
+                        text_value = v;
+                } else if (strcmp("extended_tweet", k) == 0 && json_type(v) == JSONObject) {
+                        text_value = json_object_get_value(json_object(v), "full_text");
+                        extended_node = json_object(v);
                 } else if (strcmp("retweeted_status", k) == 0 && (rt = json_object(v))) {
                         // Handling below.
@@ -516 +646 @@
                 struct twitter_xml_status *rtxs = twitter_xt_get_status(rt);
                 if (rtxs) {
-                        g_free(txs->text);
                         txs->text = g_strdup_printf("RT @%s: %s", rtxs->user->screen_name, rtxs->text);
                         txs->id = rtxs->id;
                         txs_free(rtxs);
                 }
-        } else {
-                expand_entities(&txs->text, node);
+        } else if (text_value && json_type(text_value) == JSONString) {
+                txs->text = g_strdup(json_string(text_value));
+                strip_html(txs->text);
+                expand_entities(&txs->text, node, extended_node);
         }
 
@@ -564 +695 @@
         }
 
-        expand_entities(&txs->text, node);
+        expand_entities(&txs->text, node, NULL);
 
         if (txs->text && txs->user && txs->id) {
@@ -574 +705 @@
 }
 
-static void expand_entities(char **text, const JSON_Object *node)
-{
-        JSON_Object *entities, *quoted;
+static void expand_entities(char **text, const JSON_Object *node, const JSON_Object *extended_node)
+{
+        JSON_Object *entities, *extended_entities, *quoted;
         char *quote_url = NULL, *quote_text = NULL;
 
@@ -594 +725 @@
         }
 
+        if (extended_node) {
+                extended_entities = json_object_get_object(extended_node, "entities");
+                if (extended_entities) {
+                        entities = extended_entities;
+                }
+        }
+
         JSON_O_FOREACH(entities, k, v) {
                 int i;
@@ -837 +975 @@
         struct twitter_data *td = ic->proto_data;
         char *last_id_str;
+        char *uid_str;
 
         if (status->user == NULL || status->text == NULL) {
+                return;
+        }
+        
+        /* Check this is not a tweet that should be muted */
+        uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, status->user->uid);
+
+        if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
+                g_free(uid_str);
+                return;
+        }
+        if (status->id != status->rt_id && g_slist_find_custom(td->noretweets_ids, uid_str, (GCompareFunc)strcmp)) {
+                g_free(uid_str);
                 return;
         }
@@ -863 +1014 @@
         set_setstr(&ic->acc->set, "_last_tweet", last_id_str);
         g_free(last_id_str);
+        g_free(uid_str);
 }
 
@@ -880 +1032 @@
         }
 
-        ic->flags |= OPT_PONGED;
         td = ic->proto_data;
 
@@ -896 +1047 @@
                 imc_logout(ic, TRUE);
                 return;
+        }
+
+        if (req == td->stream) {
+                ic->flags |= OPT_PONGED;
         }
 
@@ -999 +1154 @@
         JSON_Object *target = json_object_get_object(o, "target");
         const char *type = json_object_get_string(o, "event");
+        struct twitter_xml_user *us = NULL;
+        struct twitter_xml_user *ut = NULL;
 
         if (!type || !source || !target) {
@@ -1005 +1162 @@
 
         if (strcmp(type, "follow") == 0) {
-                struct twitter_xml_user *us = twitter_xt_get_user(source);
-                struct twitter_xml_user *ut = twitter_xt_get_user(target);
+                us = twitter_xt_get_user(source);
+                ut = twitter_xt_get_user(target);
                 if (g_strcasecmp(us->screen_name, td->user) == 0) {
                         twitter_add_buddy(ic, ut->screen_name, ut->name);
                 }
-                txu_free(us);
-                txu_free(ut);
-        }
+        } else if (strcmp(type, "mute") == 0) {
+                GSList *found;
+                char *uid_str;
+                ut = twitter_xt_get_user(target);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
+                if (!(found = g_slist_find_custom(td->mutes_ids, uid_str,
+                                                  (GCompareFunc)strcmp))) {
+                        td->mutes_ids = g_slist_prepend(td->mutes_ids, uid_str);
+                }
+                twitter_log(ic, "Muted user %s", ut->screen_name);
+                if (getenv("BITLBEE_DEBUG")) {
+                        fprintf(stderr, "New mute: %s %"G_GUINT64_FORMAT"\n",
+                                ut->screen_name, ut->uid);
+                }
+        } else if (strcmp(type, "unmute") == 0) {
+                GSList *found;
+                char *uid_str;
+                ut = twitter_xt_get_user(target);
+                uid_str = g_strdup_printf("%" G_GUINT64_FORMAT, ut->uid);
+                if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
+                                                (GCompareFunc)strcmp))) {
+                        char *found_str = found->data;
+                        td->mutes_ids = g_slist_delete_link(td->mutes_ids, found);
+                        g_free(found_str);
+                }
+                g_free(uid_str);
+                twitter_log(ic, "Unmuted user %s", ut->screen_name);
+                if (getenv("BITLBEE_DEBUG")) {
+                        fprintf(stderr, "New unmute: %s %"G_GUINT64_FORMAT"\n",
+                                ut->screen_name, ut->uid);
+                }
+        }
+
+        txu_free(us);
+        txu_free(ut);
 
         return TRUE;
@@ -1309 +1498 @@
         td->flags &= ~TWITTER_GOT_TIMELINE;
 
-        char *args[6];
+        char *args[8];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
         args[2] = "include_entities";
         args[3] = "true";
+        args[4] = "tweet_mode";
+        args[5] = "extended";
         if (td->timeline_id) {
-                args[4] = "since_id";
-                args[5] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
+                args[6] = "since_id";
+                args[7] = g_strdup_printf("%" G_GUINT64_FORMAT, td->timeline_id);
         }
 
         if (twitter_http(ic, TWITTER_HOME_TIMELINE_URL, twitter_http_get_home_timeline, ic, 0, args,
-                         td->timeline_id ? 6 : 4) == NULL) {
+                         td->timeline_id ? 8 : 6) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",
@@ -1331 +1522 @@
         g_free(args[1]);
         if (td->timeline_id) {
-                g_free(args[5]);
+                g_free(args[7]);
         }
 }
@@ -1346 +1537 @@
         td->flags &= ~TWITTER_GOT_MENTIONS;
 
-        char *args[6];
+        char *args[8];
         args[0] = "cursor";
         args[1] = g_strdup_printf("%" G_GINT64_FORMAT, next_cursor);
@@ -1358 +1549 @@
                 args[5] = g_strdup_printf("%d", set_getint(&ic->acc->set, "show_old_mentions"));
         }
+        args[6] = "tweet_mode";
+        args[7] = "extended";
 
         if (twitter_http(ic, TWITTER_MENTIONS_URL, twitter_http_get_mentions,
-                         ic, 0, args, 6) == NULL) {
+                         ic, 0, args, 8) == NULL) {
                 if (++td->http_fails >= 5) {
                         imcb_error(ic, "Could not retrieve %s: %s",
@@ -1529 +1722 @@
 }
 
+/**
+ * Mute or unmute a user
+ */
+void twitter_mute_create_destroy(struct im_connection *ic, char *who, int create)
+{
+        char *args[2];
+
+        args[0] = "screen_name";
+        args[1] = who;
+        twitter_http(ic, create ? TWITTER_MUTES_CREATE_URL : TWITTER_MUTES_DESTROY_URL,
+                     twitter_http_post, ic, 1, args, 2);
+}
+
 void twitter_status_destroy(struct im_connection *ic, guint64 id)
 {

protocols/twitter/twitter_lib.h

@@ -63 +63 @@
 #define TWITTER_FRIENDS_IDS_URL "/friends/ids.json"
 #define TWITTER_FOLLOWERS_IDS_URL "/followers/ids.json"
+#define TWITTER_MUTES_IDS_URL "/mutes/users/ids.json"
+#define TWITTER_NORETWEETS_IDS_URL "/friendships/no_retweets/ids.json"
 
 /* Account URLs */
@@ -76 +78 @@
 #define TWITTER_BLOCKS_DESTROY_URL "/blocks/destroy/"
 
+/* Mute URLs */
+#define TWITTER_MUTES_CREATE_URL "/mutes/users/create.json"
+#define TWITTER_MUTES_DESTROY_URL "/mutes/users/destroy.json"
+
 /* Report spam */
 #define TWITTER_REPORT_SPAM_URL "/users/report_spam.json"
@@ -87 +93 @@
 gboolean twitter_get_timeline(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_friends_ids(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_mutes_ids(struct im_connection *ic, gint64 next_cursor);
+void twitter_get_noretweets_ids(struct im_connection *ic, gint64 next_cursor);
 void twitter_get_statuses_friends(struct im_connection *ic, gint64 next_cursor);
 
@@ -92 +100 @@
 void twitter_direct_messages_new(struct im_connection *ic, char *who, char *message);
 void twitter_friendships_create_destroy(struct im_connection *ic, char *who, int create);
+void twitter_mute_create_destroy(struct im_connection *ic, char *who, int create);
 void twitter_status_destroy(struct im_connection *ic, guint64 id);
 void twitter_status_retweet(struct im_connection *ic, guint64 id);

root_commands.c

@@ -143 +143 @@
         }
 
-        if (load) {
+        status = auth_check_pass(irc, irc->user->nick, password);
+        if (load && (status == STORAGE_OK)) {
                 status = storage_load(irc, password);
-        } else {
-                status = storage_check_pass(irc->user->nick, password);
         }
 
@@ -159 +158 @@
                 irc_rootmsg(irc, "Password accepted%s",
                             load ? ", settings and accounts loaded" : "");
-                irc_setpass(irc, password);
                 irc->status |= USTATUS_IDENTIFIED;
                 irc_umode_set(irc, "+R", 1);
@@ -268 +266 @@
         storage_status_t status;
 
-        status = storage_remove(irc->user->nick, cmd[1]);
+        status = auth_check_pass(irc, irc->user->nick, cmd[1]);
+        if (status == STORAGE_OK) {
+                status = storage_remove(irc->user->nick);
+        }
+
         switch (status) {
         case STORAGE_NO_SUCH_USER:
@@ -340 +342 @@
                 int st;
 
+                if (s && s->flags & SET_LOCKED) {
+                        irc_rootmsg(irc, "This setting can not be changed");
+                        return 0;
+                }
                 if (s && checkflags && checkflags(irc, s) == 0) {
                         return 0;
@@ -388 +394 @@
                 irc_rootmsg(irc, "This setting can only be changed when the account is %s-line", "on");
                 return 0;
+        } else if (a->flags & ACC_FLAG_LOCKED && s && s->flags & ACC_SET_LOCKABLE) {
+                irc_rootmsg(irc, "This setting can not be changed for locked accounts");
+                return 0;
         }
 
@@ -409 +418 @@
 
                 MIN_ARGS(3);
+
+                if (!global.conf->allow_account_add) {
+                        irc_rootmsg(irc, "This server does not allow adding new accounts");
+                        return;
+                }
 
                 if (cmd[4] == NULL) {
@@ -456 +470 @@
                                 irc_rootmsg(irc, "No need to enter a password for this "
                                             "account since it's using OAuth");
+                        } else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+                                *a->pass = '\0';
+                        } else if (prpl->options & PRPL_OPT_PASSWORD_OPTIONAL) {
+                                *a->pass = '\0';
+                                irc_rootmsg(irc, "Passwords are optional for this account. "
+                                            "If you wish to enter the password with /OPER, do "
+                                            "account %s set -del password", a->tag);
                         } else {
                                 irc_rootmsg(irc, "You can now use the /OPER command to "
@@ -465 +486 @@
                                 }
                         }
+                } else if (prpl->options & PRPL_OPT_NO_PASSWORD) {
+                        irc_rootmsg(irc, "Note: this account doesn't use password for login");
                 }
 
@@ -553 +576 @@
 
         if (len >= 1 && g_strncasecmp(cmd[2], "del", len) == 0) {
-                if (a->ic) {
+                if (a->flags & ACC_FLAG_LOCKED) {
+                        irc_rootmsg(irc, "Account is locked, can't delete");
+                }
+                else if (a->ic) {
                         irc_rootmsg(irc, "Account is still logged in, can't delete");
                 } else {
@@ -1108 +1134 @@
 }
 
+static gint prplcmp(gconstpointer a, gconstpointer b)
+{
+        const struct prpl *pa = a;
+        const struct prpl *pb = b;
+
+        return g_strcasecmp(pa->name, pb->name);
+}
+
+static void prplstr(GList *prpls, GString *gstr)
+{
+        const char *last = NULL;
+        GList *l;
+        struct prpl *p;
+
+        prpls = g_list_copy(prpls);
+        prpls = g_list_sort(prpls, prplcmp);
+
+        for (l = prpls; l; l = l->next) {
+                p = l->data;
+
+                if (last && g_strcasecmp(p->name, last) == 0) {
+                        /* Ignore duplicates (mainly for libpurple) */
+                        continue;
+                }
+
+                if (gstr->len != 0) {
+                        g_string_append(gstr, ", ");
+                }
+
+                g_string_append(gstr, p->name);
+                last = p->name;
+        }
+
+        g_list_free(prpls);
+}
+
+static void cmd_plugins(irc_t *irc, char **cmd)
+{
+        GList *prpls;
+        GString *gstr;
+
+#ifdef WITH_PLUGINS
+        GList *l;
+        struct plugin_info *info;
+
+        for (l = get_plugins(); l; l = l->next) {
+                info = l->data;
+                irc_rootmsg(irc, "%s:", info->name);
+                irc_rootmsg(irc, "  Version: %s", info->version);
+
+                if (info->description) {
+                        irc_rootmsg(irc, "  Description: %s", info->description);
+                }
+
+                if (info->author) {
+                        irc_rootmsg(irc, "  Author: %s", info->author);
+                }
+
+                if (info->url) {
+                        irc_rootmsg(irc, "  URL: %s", info->url);
+                }
+
+                irc_rootmsg(irc, "");
+        }
+#endif
+
+        gstr = g_string_new(NULL);
+        prpls = get_protocols();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Enabled Protocols: %s", gstr->str);
+                g_string_truncate(gstr, 0);
+        }
+
+        prpls = get_protocols_disabled();
+
+        if (prpls) {
+                prplstr(prpls, gstr);
+                irc_rootmsg(irc, "Disabled Protocols: %s", gstr->str);
+        }
+
+        g_string_free(gstr, TRUE);
+}
+
 static void cmd_qlist(irc_t *irc, char **cmd)
 {
@@ -1134 +1245 @@
 
         if (g_strcasecmp(cmd[1], "add") == 0) {
-                char *channel, *s;
+                bee_chat_info_t *ci;
+                char *channel, *room, *s;
                 struct irc_channel *ic;
+                guint i;
 
                 MIN_ARGS(3);
@@ -1147 +1260 @@
                 }
 
+                if (cmd[3][0] == '!') {
+                        if (!acc->ic || !(acc->ic->flags & OPT_LOGGED_IN)) {
+                                irc_rootmsg(irc, "Not logged in to account.");
+                                return;
+                        } else if (!acc->prpl->chat_list) {
+                                irc_rootmsg(irc, "Listing chatrooms not supported on that account.");
+                                return;
+                        }
+
+                        i = g_ascii_strtoull(cmd[3] + 1, NULL, 10);
+                        ci = g_slist_nth_data(acc->ic->chatlist, i - 1);
+
+                        if (ci == NULL) {
+                                irc_rootmsg(irc, "Invalid chatroom index");
+                                return;
+                        }
+
+                        room = ci->title;
+                } else {
+                        room = cmd[3];
+                }
+
                 if (cmd[4] == NULL) {
-                        channel = g_strdup(cmd[3]);
+                        channel = g_strdup(room);
                         if ((s = strchr(channel, '@'))) {
                                 *s = 0;
@@ -1168 +1303 @@
                     set_setstr(&ic->set, "chat_type", "room") &&
                     set_setstr(&ic->set, "account", cmd[2]) &&
-                    set_setstr(&ic->set, "room", cmd[3])) {
+                    set_setstr(&ic->set, "room", room)) {
                         irc_rootmsg(irc, "Chatroom successfully added.");
                 } else {
@@ -1178 +1313 @@
                 }
                 g_free(channel);
+        } else if (g_strcasecmp(cmd[1], "list") == 0) {
+                MIN_ARGS(2);
+
+                if (!(acc = account_get(irc->b, cmd[2]))) {
+                        irc_rootmsg(irc, "Invalid account");
+                        return;
+                } else if (!acc->ic || !(acc->ic->flags & OPT_LOGGED_IN)) {
+                        irc_rootmsg(irc, "Not logged in to account.");
+                        return;
+                } else if (!acc->prpl->chat_list) {
+                        irc_rootmsg(irc, "Listing chatrooms not supported on that account.");
+                        return;
+                }
+
+                acc->prpl->chat_list(acc->ic, cmd[3]);
         } else if (g_strcasecmp(cmd[1], "with") == 0) {
                 irc_user_t *iu;
@@ -1192 +1342 @@
                         irc_rootmsg(irc, "Can't open a groupchat with %s.", cmd[2]);
                 }
-        } else if (g_strcasecmp(cmd[1], "list") == 0 ||
-                   g_strcasecmp(cmd[1], "set") == 0 ||
+        } else if (g_strcasecmp(cmd[1], "set") == 0 ||
                    g_strcasecmp(cmd[1], "del") == 0) {
                 irc_rootmsg(irc,
@@ -1203 +1352 @@
                             cmd[1]);
         }
+}
+
+/* some arbitrary numbers */
+#define CHAT_TITLE_LEN_MIN 20
+#define CHAT_TITLE_LEN_MAX 100
+
+void cmd_chat_list_finish(struct im_connection *ic)
+{
+        account_t *acc = ic->acc;
+        bee_chat_info_t *ci;
+        char *hformat, *iformat, *topic, *padded;
+        GSList *l;
+        guint i = 0;
+        long title_len, new_len;
+        irc_t *irc = ic->bee->ui_data;
+
+        if (ic->chatlist == NULL) {
+                irc_rootmsg(irc, "No existing chatrooms");
+                return;
+        }
+
+        /* find a reasonable width for the table */
+        title_len = CHAT_TITLE_LEN_MIN;
+
+        for (l = ic->chatlist; l; l = l->next) {
+                ci = l->data;
+                new_len = g_utf8_strlen(ci->title, -1);
+
+                if (new_len >= CHAT_TITLE_LEN_MAX) {
+                        title_len = CHAT_TITLE_LEN_MAX;
+                        break;
+                } else if (title_len < new_len) {
+                        title_len = new_len;
+                }
+        }
+
+        if (strchr(irc->umode, 'b') != NULL) {
+                hformat = "%s\t%s\t%s";
+                iformat = "%u\t%s\t%s";
+        } else {
+                hformat = "%s  %s  %s";
+                iformat = "%5u  %s  %s";
+        }
+
+        padded = str_pad_and_truncate("Title", title_len, NULL);
+        irc_rootmsg(irc, hformat, "Index", padded, "Topic");
+        g_free(padded);
+
+        for (l = ic->chatlist; l; l = l->next) {
+                ci = l->data;
+                topic = ci->topic ? ci->topic : "";
+
+                padded = str_pad_and_truncate(ci->title, title_len, "[...]");
+                irc_rootmsg(irc, iformat, ++i, padded, topic);
+                g_free(padded);
+        }
+
+        irc_rootmsg(irc, "%u %s chatrooms", i, acc->tag);
 }
 
@@ -1256 +1463 @@
 {
         GSList *files = irc->file_transfers;
+        GSList *next;
 
         enum { LIST, REJECT, CANCEL };
@@ -1273 +1481 @@
         }
 
-        for (; files; files = g_slist_next(files)) {
+        for (; files; files = next) {
+                next = files->next;
                 file_transfer_t *file = files->data;
 
@@ -1357 +1566 @@
         { "nick",           1, cmd_nick,           0 },
         { "no",             0, cmd_yesno,          0 },
+        { "plugins",        0, cmd_plugins,        0 },
         { "qlist",          0, cmd_qlist,          0 },
         { "register",       0, cmd_register,       0 },

set.h

@@ -49 +49 @@
         SET_PASSWORD = 0x0400, /* Value shows up in settings list as "********". */
         SET_HIDDEN_DEFAULT = 0x0800, /* Hide unless changed from default. */
+        SET_LOCKED = 0x1000    /* Setting is locked, don't allow changing it */
 } set_flags_t;
 

storage.c

@@ -29 +29 @@
 #include "bitlbee.h"
 
-extern storage_t storage_text;
 extern storage_t storage_xml;
 
@@ -92 +91 @@
 }
 
-storage_status_t storage_check_pass(const char *nick, const char *password)
+storage_status_t storage_check_pass(irc_t *irc, const char *nick, const char *password)
 {
         GList *gl;
@@ -102 +101 @@
                 storage_status_t status;
 
-                status = st->check_pass(nick, password);
+                status = st->check_pass(irc, nick, password);
                 if (status != STORAGE_NO_SUCH_USER) {
                         return status;
@@ -176 +175 @@
 }
 
-storage_status_t storage_remove(const char *nick, const char *password)
+storage_status_t storage_remove(const char *nick)
 {
         GList *gl;
@@ -190 +189 @@
                 storage_status_t status;
 
-                status = st->remove(nick, password);
+                status = st->remove(nick);
                 ok |= status == STORAGE_OK;
                 if (status != STORAGE_NO_SUCH_USER && status != STORAGE_OK) {

storage.h

@@ -31 +31 @@
         STORAGE_NO_SUCH_USER,
         STORAGE_INVALID_PASSWORD,
+        STORAGE_CHECK_BACKEND,
         STORAGE_ALREADY_EXISTS,
         STORAGE_OTHER_ERROR /* Error that isn't caused by user input, such as
@@ -43 +44 @@
         void (*init)(void);
 
-        storage_status_t (*check_pass)(const char *nick, const char *password);
+        storage_status_t (*check_pass)(irc_t *irc, const char *nick, const char *password);
 
         storage_status_t (*load)(irc_t *irc, const char *password);
         storage_status_t (*save)(irc_t *irc, int overwrite);
-        storage_status_t (*remove)(const char *nick, const char *password);
+        storage_status_t (*remove)(const char *nick);
 
         /* May be NULL if not supported by backend */
@@ -53 +54 @@
 } storage_t;
 
-storage_status_t storage_check_pass(const char *nick, const char *password);
+storage_status_t storage_check_pass(irc_t *irc, const char *nick, const char *password);
 
 storage_status_t storage_load(irc_t * irc, const char *password);
 storage_status_t storage_save(irc_t *irc, char *password, int overwrite);
-storage_status_t storage_remove(const char *nick, const char *password);
+storage_status_t storage_remove(const char *nick);
 
 void register_storage_backend(storage_t *);

storage_xml.c

@@ -34 +34 @@
 
 typedef enum {
-        XML_PASS_CHECK_ONLY = -1,
-        XML_PASS_UNKNOWN = 0,
-        XML_PASS_WRONG,
-        XML_PASS_OK
-} xml_pass_st;
+        XML_PASS_CHECK = 0,
+        XML_LOAD
+} xml_action;
 
 /* To make it easier later when extending the format: */
@@ -65 +63 @@
 {
         struct xt_node *c;
+        struct set *s;
 
         for (c = node->children; (c = xt_find_node(c, "setting")); c = c->next) {
                 char *name = xt_find_attr(c, "name");
+                char *locked = xt_find_attr(c, "locked");
 
                 if (!name) {
@@ -80 +80 @@
                 }
                 set_setstr(head, name, c->text);
+                if (locked && !g_strcasecmp(locked, "true")) {
+                        s = set_find(head, name);
+                        if (s) {
+                                s->flags |= SET_LOCKED;
+                        }
+                }
         }
 }
@@ -105 +111 @@
 {
         struct xml_parsedata *xd = data;
-        char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag;
+        char *protocol, *handle, *server, *password = NULL, *autoconnect, *tag, *locked;
         char *pass_b64 = NULL;
         unsigned char *pass_cr = NULL;
@@ -118 +124 @@
         autoconnect = xt_find_attr(node, "autoconnect");
         tag = xt_find_attr(node, "tag");
+        locked = xt_find_attr(node, "locked");
 
         protocol = xt_find_attr(node, "protocol");
@@ -130 +137 @@
         if (!handle || !pass_b64 || !protocol || !prpl) {
                 return XT_ABORT;
-        } else if ((pass_len = base64_decode(pass_b64, (unsigned char **) &pass_cr)) &&
-                   arc_decode(pass_cr, pass_len, &password, xd->given_pass) >= 0) {
-                acc = account_add(xd->irc->b, prpl, handle, password);
-                if (server) {
-                        set_setstr(&acc->set, "server", server);
-                }
-                if (autoconnect) {
-                        set_setstr(&acc->set, "auto_connect", autoconnect);
-                }
-                if (tag) {
-                        set_setstr(&acc->set, "tag", tag);
-                }
-                if (prpl == &protocol_missing) {
-                        set_t *s = set_add(&acc->set, "_protocol_name", protocol, NULL, NULL);
-                        s->flags |= SET_HIDDEN | SET_NOSAVE |
-                                    ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
-                }
+        }
+
+        pass_len = base64_decode(pass_b64, (unsigned char **) &pass_cr);
+        if (xd->irc->auth_backend) {
+                password = g_strdup((char *)pass_cr);
         } else {
-                g_free(pass_cr);
-                g_free(password);
-                return XT_ABORT;
+                pass_len = arc_decode(pass_cr, pass_len, &password, xd->given_pass);
+                if (pass_len < 0) {
+                        g_free(pass_cr);
+                        g_free(password);
+                        return XT_ABORT;
+                }
+        }
+
+        acc = account_add(xd->irc->b, prpl, handle, password);
+        if (server) {
+                set_setstr(&acc->set, "server", server);
+        }
+        if (autoconnect) {
+                set_setstr(&acc->set, "auto_connect", autoconnect);
+        }
+        if (tag) {
+                set_setstr(&acc->set, "tag", tag);
+        }
+        if (locked && !g_strcasecmp(locked, "true")) {
+                acc->flags |= ACC_FLAG_LOCKED;
+        }
+        if (prpl == &protocol_missing) {
+                set_t *s = set_add(&acc->set, "_protocol_name", protocol, NULL, NULL);
+                s->flags |= SET_HIDDEN | SET_NOSAVE |
+                            ACC_SET_OFFLINE_ONLY | ACC_SET_ONLINE_ONLY;
         }
 
@@ -210 +227 @@
 };
 
-static storage_status_t xml_load_real(irc_t *irc, const char *my_nick, const char *password, xml_pass_st action)
+static storage_status_t xml_load_real(irc_t *irc, const char *my_nick, const char *password, xml_action action)
 {
         struct xml_parsedata xd[1];
@@ -252 +269 @@
         }
 
-        {
+        if (action == XML_PASS_CHECK) {
                 char *nick = xt_find_attr(node, "nick");
                 char *pass = xt_find_attr(node, "password");
-
-                if (!nick || !pass) {
+                char *backend = xt_find_attr(node, "auth_backend");
+
+                if (!nick || !(pass || backend)) {
                         goto error;
+                }
+
+                if (backend) {
+                        g_free(xd->irc->auth_backend);
+                        xd->irc->auth_backend = g_strdup(backend);
+                        ret = STORAGE_CHECK_BACKEND;
                 } else if ((st = md5_verify_password(xd->given_pass, pass)) != 0) {
                         ret = STORAGE_INVALID_PASSWORD;
-                        goto error;
-                }
-        }
-
-        if (action == XML_PASS_CHECK_ONLY) {
-                ret = STORAGE_OK;
-                goto error;
-        }
-
-        /* DO NOT call xt_handle() before verifying the password! */
+                } else {
+                        ret = STORAGE_OK;
+                }
+                goto error;
+        }
+
         if (xt_handle(xp, NULL, 1) == XT_HANDLED) {
                 ret = STORAGE_OK;
@@ -284 +304 @@
 static storage_status_t xml_load(irc_t *irc, const char *password)
 {
-        return xml_load_real(irc, irc->user->nick, password, XML_PASS_UNKNOWN);
-}
-
-static storage_status_t xml_check_pass(const char *my_nick, const char *password)
-{
-        return xml_load_real(NULL, my_nick, password, XML_PASS_CHECK_ONLY);
+        return xml_load_real(irc, irc->user->nick, password, XML_LOAD);
+}
+
+static storage_status_t xml_check_pass(irc_t *irc, const char *my_nick, const char *password)
+{
+        return xml_load_real(irc, my_nick, password, XML_PASS_CHECK);
 }
 
@@ -304 +324 @@
         struct xt_node *root, *cur;
 
-        /* Generate a salted md5sum of the password. Use 5 bytes for the salt
-           (to prevent dictionary lookups of passwords) to end up with a 21-
-           byte password hash, more convenient for base64 encoding. */
-        random_bytes(pass_md5 + 16, 5);
-        md5_init(&md5_state);
-        md5_append(&md5_state, (md5_byte_t *) irc->password, strlen(irc->password));
-        md5_append(&md5_state, pass_md5 + 16, 5);   /* Add the salt. */
-        md5_finish(&md5_state, pass_md5);
-        /* Save the hash in base64-encoded form. */
-        pass_buf = base64_encode(pass_md5, 21);
-
         root = cur = xt_new_node("user", NULL, NULL);
+        if (irc->auth_backend) {
+                xt_add_attr(cur, "auth_backend", irc->auth_backend);
+        } else {
+                /* Generate a salted md5sum of the password. Use 5 bytes for the salt
+                   (to prevent dictionary lookups of passwords) to end up with a 21-
+                   byte password hash, more convenient for base64 encoding. */
+                random_bytes(pass_md5 + 16, 5);
+                md5_init(&md5_state);
+                md5_append(&md5_state, (md5_byte_t *) irc->password, strlen(irc->password));
+                md5_append(&md5_state, pass_md5 + 16, 5);   /* Add the salt. */
+                md5_finish(&md5_state, pass_md5);
+                /* Save the hash in base64-encoded form. */
+                pass_buf = base64_encode(pass_md5, 21);
+                xt_add_attr(cur, "password", pass_buf);
+                g_free(pass_buf);
+        }
+
         xt_add_attr(cur, "nick", irc->user->nick);
-        xt_add_attr(cur, "password", pass_buf);
         xt_add_attr(cur, "version", XML_FORMAT_VERSION);
-
-        g_free(pass_buf);
 
         xml_generate_settings(cur, &irc->b->set);
@@ -331 +354 @@
                 int pass_len;
 
-                pass_len = arc_encode(acc->pass, strlen(acc->pass), (unsigned char **) &pass_cr, irc->password, 12);
-                pass_b64 = base64_encode(pass_cr, pass_len);
-                g_free(pass_cr);
+                if(irc->auth_backend) {
+                        /* If we don't "own" the password, it may change without us
+                         * knowing, so we cannot encrypt the data, as we then may not be
+                         * able to decrypt it */
+                        pass_b64 = base64_encode((unsigned char *)acc->pass, strlen(acc->pass));
+                } else {
+                        pass_len = arc_encode(acc->pass, strlen(acc->pass), (unsigned char **) &pass_cr, irc->password, 12);
+                        pass_b64 = base64_encode(pass_cr, pass_len);
+                        g_free(pass_cr);
+                }
 
                 cur = xt_new_node("account", NULL, NULL);
@@ -348 +378 @@
                         xt_add_attr(cur, "server", acc->server);
                 }
+                if (acc->flags & ACC_FLAG_LOCKED) {
+                        xt_add_attr(cur, "locked", "true");
+                }
 
                 g_free(pass_b64);
@@ -392 +425 @@
                         xt_add_child(cur, xset = xt_new_node("setting", set->value, NULL));
                         xt_add_attr(xset, "name", set->key);
+                        if (set->flags & SET_LOCKED) {
+                                xt_add_attr(xset, "locked", "true");
+                        }
                 }
         }
@@ -450 +486 @@
 
 
-static storage_status_t xml_remove(const char *nick, const char *password)
+static storage_status_t xml_remove(const char *nick)
 {
         char s[512], *lc;
-        storage_status_t status;
-
-        status = xml_check_pass(nick, password);
-        if (status != STORAGE_OK) {
-                return status;
-        }
 
         lc = g_strdup(nick);

tests/Makefile

@@ -15 +15 @@
 distclean: clean
 
-main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o storage_xml.o
+main_objs = bitlbee.o conf.o dcc.o help.o ipc.o irc.o irc_cap.o irc_channel.o irc_commands.o irc_im.o irc_send.o irc_user.o irc_util.o irc_commands.o log.o nick.o query.o root_commands.o set.o storage.o $(STORAGE_OBJS) auth.o $(AUTH_OBJS)
 
 test_objs = check.o check_util.o check_nick.o check_md5.o check_arc.o check_irc.o check_help.o check_user.o check_set.o check_jabber_sasl.o check_jabber_util.o

tests/check_jabber_util.c

@@ -103 +103 @@
         fail_unless(jabber_compare_jid("bugtest@google.com/A", "bugtest@google.com/A"));
         fail_if(jabber_compare_jid("", "bugtest@google.com/A"));
+        fail_if(jabber_compare_jid(NULL, ""));
+        fail_if(jabber_compare_jid("", NULL));
 }
 

tests/check_util.c

@@ -137 +137 @@
                 5,
                 "aaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\naaaaa\na",
+        },
+        {
+                "áááááááááá",
+                11,
+                "ááááá\nááááá",
         },
         {

unix.c

@@ -80 +80 @@
         }
 
+        if (global.conf->runmode == RUNMODE_INETD) {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
+        } else {
+                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
+                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
+        }
+
         b_main_init();
 
@@ -104 +112 @@
         }
 
+        global.auth = auth_init(global.conf->auth_backend);
+        if (global.conf->auth_backend && global.auth == NULL) {
+                log_message(LOGLVL_ERROR, "Unable to load authentication backend '%s'", global.conf->auth_backend);
+                return(1);
+        }
+
         if (global.conf->runmode == RUNMODE_INETD) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_IRC);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_IRC);
-
                 i = bitlbee_inetd_init();
                 log_message(LOGLVL_INFO, "%s %s starting in inetd mode.", PACKAGE, BITLBEE_VERSION);
 
         } else if (global.conf->runmode == RUNMODE_DAEMON) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
-
                 i = bitlbee_daemon_init();
                 log_message(LOGLVL_INFO, "%s %s starting in daemon mode.", PACKAGE, BITLBEE_VERSION);
         } else if (global.conf->runmode == RUNMODE_FORKDAEMON) {
-                log_link(LOGLVL_ERROR, LOGOUTPUT_CONSOLE);
-                log_link(LOGLVL_WARNING, LOGOUTPUT_CONSOLE);
-
                 /* In case the operator requests a restart, we need this. */
                 old_cwd = g_malloc(256);