9.7.1

2 files changed, 9 insertions, 9 deletions

diff --git a/contrib/dlz/drivers/dlz_bdbhpt_driver.c b/contrib/dlz/drivers/dlz_bdbhpt_driver.c
index da5b235b..3a170d6f 100644
--- a/contrib/dlz/drivers/dlz_bdbhpt_driver.c
+++ b/contrib/dlz/drivers/dlz_bdbhpt_driver.c
@@ -442,7 +442,7 @@ bdbhpt_allnodes(const char *zone, void *driverarg, void *dbdata,
 		xfr_cursor->c_close(xfr_cursor);
 
 	if (dns_cursor != NULL)
-		dns_cursor->c_close(xfr_cursor);
+		dns_cursor->c_close(dns_cursor);
 
 	return result;
 }
diff --git a/contrib/dlz/drivers/sdlz_helper.c b/contrib/dlz/drivers/sdlz_helper.c
index ea33db1b..a7d7f4af 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;
 	}