--- a/src/lib-dns/test-dns-util.c	Mon Dec 19 12:16:20 2016 +0200
+++ b/src/lib-dns/test-dns-util.c	Wed Dec 21 19:50:10 2016 +0200
@@ -106,7 +106,8 @@
 	array_sort(&arr, arr_dns_compare);
 
 	for(size_t i = 0; i < N_ELEMENTS(output); i++) {
-		test_assert_idx(dns_compare(*array_idx(&arr, i), output[i]) == 0, i);
+		const char *const *strp = array_idx(&arr, i);
+		test_assert_idx(dns_compare(*strp, output[i]) == 0, i);
 	}
 
 	test_end();

--- a/src/plugins/dict-ldap/dict-ldap.c	Mon Dec 19 12:16:20 2016 +0200
+++ b/src/plugins/dict-ldap/dict-ldap.c	Wed Dec 21 19:50:10 2016 +0200
@@ -186,8 +186,11 @@
 
 	for(size_t i = 0; i < array_count(values) && i < array_count(&(map->ldap_attributes)); i++) {
 		struct var_expand_table entry;
-		entry.value = *array_idx(values, i);
-		entry.long_key = *array_idx(&(map->ldap_attributes), i);
+		const char *const *valuep = array_idx(values, i);
+		const char *const *long_keyp = array_idx(&(map->ldap_attributes), i);
+
+		entry.value = *valuep;
+		entry.long_key = *long_keyp;
 		array_append(&exp, &entry, 1);
 	}