From 7d3c1ed92733a05ab4282993ffe58fb88a1b50e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 23 May 2018 01:09:19 +0200
Subject: Do not use (or present to the user) the Address field in fixed mode

fix #3359
---
 src/irc/irc_client.cpp              | 3 ++-
 src/xmpp/biboumi_adhoc_commands.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/irc/irc_client.cpp b/src/irc/irc_client.cpp
index d0b2153..d7fa2cd 100644
--- a/src/irc/irc_client.cpp
+++ b/src/irc/irc_client.cpp
@@ -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 " +
diff --git a/src/xmpp/biboumi_adhoc_commands.cpp b/src/xmpp/biboumi_adhoc_commands.cpp
index b62dcfc..3bd2e5a 100644
--- a/src/xmpp/biboumi_adhoc_commands.cpp
+++ b/src/xmpp/biboumi_adhoc_commands.cpp
@@ -230,6 +230,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";
@@ -409,7 +410,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")
-- 
cgit v1.2.3


From d3eda68761d6b5f4394c41248ae95915d6e90ae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Wed, 23 May 2018 01:12:31 +0200
Subject: Release version 8.2

---
 CHANGELOG.rst                | 6 ++++++
 CMakeLists.txt               | 2 +-
 packaging/biboumi.spec.cmake | 3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1385f40..cd7c4a1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,9 @@
+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
 ========================
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d59aa7..26f2f11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 project(biboumi)
 
 set(${PROJECT_NAME}_VERSION_MAJOR 8)
-set(${PROJECT_NAME}_VERSION_MINOR 1)
+set(${PROJECT_NAME}_VERSION_MINOR 2)
 set(${PROJECT_NAME}_VERSION_SUFFIX "")
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake
index 119505c..d658c55 100644
--- a/packaging/biboumi.spec.cmake
+++ b/packaging/biboumi.spec.cmake
@@ -63,6 +63,9 @@ make check %{?_smp_mflags}
 
 
 %changelog
+* 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
 
-- 
cgit v1.2.3