mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

2894. [contrib] DLZ LDAP support now use '$' not '%'. [RT #21294]

Browse Source
This commit is contained in:
Mark Andrews
2010-05-14 06:29:37 +00:00
parent 462d82f8e5
commit dc64df4479
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
2894. [contrib] DLZ LDAP support now use '$' not '%'. [RT #21294]
2893. [bug] Improve managed keys support. New named.conf option 2893. [bug] Improve managed keys support. New named.conf option
managed-keys-directory. [RT #20924] managed-keys-directory. [RT #20924]

16
contrib/dlz/drivers/sdlz_helper.c
View File

@@ -166,12 +166,12 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone,
ISC_LIST_APPEND(*tql, tseg, link); 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 * left portion
*/ */
tseg->sql = isc_mem_strdup(mctx, tseg->sql = isc_mem_strdup(mctx,
isc_string_separate(&right_str, isc_string_separate(&right_str,
"%")); "$"));
if (tseg->sql == NULL) { if (tseg->sql == NULL) {
/* no memory, clean everything up. */ /* no memory, clean everything up. */
result = ISC_R_NOMEMORY; 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->direct = isc_boolean_true;
tseg->strlen = strlen(tseg->sql); tseg->strlen = strlen(tseg->sql);
/* check if we encountered "%zone%" token */ /* check if we encountered "$zone$" token */
if (strcasecmp(tseg->sql, "zone") == 0) { if (strcasecmp(tseg->sql, "zone") == 0) {
/* /*
* we don't really need, or want the "zone" * 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->sql points in-directly to a string */
tseg->direct = isc_boolean_false; tseg->direct = isc_boolean_false;
foundzone = isc_boolean_true; foundzone = isc_boolean_true;
/* check if we encountered "%record%" token */ /* check if we encountered "$record$" token */
} else if (strcasecmp(tseg->sql, "record") == 0) { } else if (strcasecmp(tseg->sql, "record") == 0) {
/* /*
* we don't really need, or want the "record" * 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->sql points in-directly poinsts to a string */
tseg->direct = isc_boolean_false; tseg->direct = isc_boolean_false;
foundrecord = isc_boolean_true; foundrecord = isc_boolean_true;
/* check if we encountered "%client%" token */ /* check if we encountered "$client$" token */
} else if (strcasecmp(tseg->sql, "client") == 0) { } else if (strcasecmp(tseg->sql, "client") == 0) {
/* /*
* we don't really need, or want the "client" * 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 */ /* Write error message to log */
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
"Required token %%client%% not found."); "Required token $client$ not found.");
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto flag_fail; goto flag_fail;
} }
@@ -245,7 +245,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone,
/* Write error message to log */ /* Write error message to log */
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
"Required token %%record%% not found."); "Required token $record$ not found.");
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto flag_fail; goto flag_fail;
} }
@@ -255,7 +255,7 @@ build_querylist(isc_mem_t *mctx, const char *query_str, char **zone,
/* Write error message to log */ /* Write error message to log */
isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE, isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
DNS_LOGMODULE_DLZ, ISC_LOG_ERROR, DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
"Required token %%zone%% not found."); "Required token $zone$ not found.");
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
goto flag_fail; goto flag_fail;
} }