changeset 22579:38950f24f3d5

auth: Fix %{ldap_dn} change to compile with v2.2 API
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Fri, 06 Oct 2017 16:30:11 +0300
parents 1ac298b49c89
children b88a68d75655
files src/auth/db-ldap.c
diffstat 1 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/auth/db-ldap.c	Fri Sep 15 15:17:08 2017 +0300
+++ b/src/auth/db-ldap.c	Fri Oct 06 16:30:11 2017 +0300
@@ -1656,13 +1656,11 @@
 	return db_ldap_field_expand(field_name, ctx);
 }
 
-static int
-db_ldap_field_dn_expand(const char *data ATTR_UNUSED, void *context ATTR_UNUSED,
-			 const char **value_r, const char **error_r ATTR_UNUSED)
+static const char *
+db_ldap_field_dn_expand(const char *data ATTR_UNUSED, void *context ATTR_UNUSED)
 {
 	struct db_ldap_result_iterate_context *ctx = context;
-	*value_r = ldap_get_dn(ctx->ld, ctx->ldap_msg);
-	return 1;
+	return ldap_get_dn(ctx->ld, ctx->ldap_msg);
 }
 
 static struct var_expand_func_table ldap_var_funcs_table[] = {