From dc64df4479df5e7cb3ed1dead21888b5af98f67e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Fri, 14 May 2010 06:29:37 +0000 Subject: [PATCH] 2894. [contrib] DLZ LDAP support now use '$' not '%'. [RT #21294] --- CHANGES | 2 ++ contrib/dlz/drivers/sdlz_helper.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index b59c87ff65..6d51d6d93e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,5 @@ +2894. [contrib] DLZ LDAP support now use '$' not '%'. [RT #21294] + 2893. [bug] Improve managed keys support. New named.conf option managed-keys-directory. [RT #20924] diff --git a/contrib/dlz/drivers/sdlz_helper.c b/contrib/dlz/drivers/sdlz_helper.c index ea33db1b91..a7d7f4af38 100644 --- a/contrib/dlz/drivers/sdlz_helper.c +++ b/contrib/dlz/drivers/sdlz_helper.c @@ -166,12 +166,12 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, ISC_LIST_APPEND(*tql, tseg, link); /* - * split string at the first "%". set query segment to + * split string at the first "$". set query segment to * left portion */ tseg->sql = isc_mem_strdup(mctx, isc_string_separate(&right_str, - "%")); + "$")); if (tseg->sql == NULL) { /* no memory, clean everything up. */ result = ISC_R_NOMEMORY; @@ -181,7 +181,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, tseg->direct = isc_boolean_true; tseg->strlen = strlen(tseg->sql); - /* check if we encountered "%zone%" token */ + /* check if we encountered "$zone$" token */ if (strcasecmp(tseg->sql, "zone") == 0) { /* * we don't really need, or want the "zone" @@ -194,7 +194,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, /* tseg->sql points in-directly to a string */ tseg->direct = isc_boolean_false; foundzone = isc_boolean_true; - /* check if we encountered "%record%" token */ + /* check if we encountered "$record$" token */ } else if (strcasecmp(tseg->sql, "record") == 0) { /* * we don't really need, or want the "record" @@ -207,7 +207,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, /* tseg->sql points in-directly poinsts to a string */ tseg->direct = isc_boolean_false; foundrecord = isc_boolean_true; - /* check if we encountered "%client%" token */ + /* check if we encountered "$client$" token */ } else if (strcasecmp(tseg->sql, "client") == 0) { /* * we don't really need, or want the "client" @@ -235,7 +235,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, /* Write error message to log */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, - "Required token %%client%% not found."); + "Required token $client$ not found."); result = ISC_R_FAILURE; goto flag_fail; } @@ -245,7 +245,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, /* Write error message to log */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, - "Required token %%record%% not found."); + "Required token $record$ not found."); result = ISC_R_FAILURE; goto flag_fail; } @@ -255,7 +255,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone, /* Write error message to log */ isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, - "Required token %%zone%% not found."); + "Required token $zone$ not found."); result = ISC_R_FAILURE; goto flag_fail; }