4 files changed, 13 insertions(+), 4 deletions(-)

M CHANGELOG.rst
M packaging/biboumi.spec.cmake
M src/irc/irc_client.cpp
M src/xmpp/biboumi_adhoc_commands.cpp

@@ 3,6 3,12 @@ Version 9.0
 
 - SIGHUP is now caught and reloads the configuration like SIGUSR1 and 2.
 
+Version 8.2 - 2018-05-23
+========================
+
+- The users are not able to bypass the fixed mode by just configuring a
+  different Address for the IRC server anymore.
+
 Version 8.1 - 2018-05-14
 ========================
 

@@ 66,10 66,11 @@ make check %{?_smp_mflags}
 %changelog
 * ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
 - Build latest git revision
-
-* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
 - Build against botan2
 
+* Wed May 25 2018 Le Coz Florent <louiz@louiz.org> - 8.2-1
+  Update to version 8.1
+
 * Wed May 14 2018 Le Coz Florent <louiz@louiz.org> - 8.1-1
   Update to version 8.1
 

@@ 195,7 195,8 @@ void IrcClient::start()
 # ifdef BOTAN_FOUND
   this->credential_manager.set_trusted_fingerprint(options.col<Database::TrustedFingerprint>());
 # endif
-  if (!options.col<Database::Address>().empty())
+  if (Config::get("fixed_irc_server", "").empty() &&
+      !options.col<Database::Address>().empty())
     address = options.col<Database::Address>();
 #endif
   this->bridge.send_xmpp_message(this->hostname, "", "Connecting to " +

@@ 232,6 232,7 @@ void ConfigureIrcServerStep1(XmppComponent&, AdhocSession& session, XmlNode& com
   XmlSubNode instructions(x, "instructions");
   instructions.set_inner("Edit the form, to configure the settings of the IRC server " + server_domain);
 
+  if (Config::get("fixed_irc_server", "").empty())
   {
     XmlSubNode field(x, "field");
     field["var"] = "address";


@@ 411,7 412,7 @@ void ConfigureIrcServerStep2(XmppComponent&, AdhocSession& session, XmlNode& com
           const XmlNode* value = field->get_child("value", "jabber:x:data");
           const std::vector<const XmlNode*> values = field->get_children("value", "jabber:x:data");
 
-          if (field->get_tag("var") == "address" && value)
+          if (field->get_tag("var") == "address" && value && Config::get("fixed_irc_server", "").empty())
             options.col<Database::Address>() = value->get_inner();
 
           if (field->get_tag("var") == "ports")