Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c

2 files changed, 4 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index c1aa6318..3aae0a12 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 D-Bus 1.5.10 (UNRELEASED)
 ==
 
+• Allow all configured auth mechanisms, not just one (fd.o #45106,
+  Pavel Strashkin)
+
 • Improve cmake build system (Ralf Habacker):
   · simplify XML parser dependencies (fd.o #41027)
   · generate build timestamp (fd.o #41029)
diff --git a/bus/bus.c b/bus/bus.c
index 748ee90a..358a9106 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -392,6 +392,7 @@ process_config_first_time_only (BusContext       *context,
           if (auth_mechanisms[i] == NULL)
             goto oom;
           link = _dbus_list_get_next_link (auth_mechanisms_list, link);
+          i += 1;
         }
     }
   else