summaryrefslogtreecommitdiff
path: root/bus/bus.c
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-01-23 10:33:35 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-01-23 10:33:35 +0000
commit61758931005407de85952169e8253a72805e59ef (patch)
treed787355c2f044bdec2c6a4f5e558f30be9af6c0e /bus/bus.c
parent09207d4d4a9e4e68d0786a7b444343a75d57dfc6 (diff)
parent08dd53c14b53b88cf798b910952ab3832b83c24c (diff)
downloaddbus-61758931005407de85952169e8253a72805e59ef.tar.gz
Merge branch 'dbus-1.4', rejecting commit 08dd53c14b53b88c
Diffstat (limited to 'bus/bus.c')
-rw-r--r--bus/bus.c1
1 files changed, 1 insertions, 0 deletions
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