*** bind-9.6.1/contrib/dlz/drivers/sdlz_helper.c.realorig	2008-01-27 15:46:49.000000000 +0100
--- bind-9.6.1/contrib/dlz/drivers/sdlz_helper.c	2008-01-27 15:46:49.000000000 +0100
***************
*** 181,187 ****
  		tseg->direct = isc_boolean_true;
  		tseg->strlen = strlen(tseg->sql);
  
! 		/* check if we encountered "%zone%" token */
  		if (strcasecmp(tseg->sql, "zone") == 0) {
  			/*
  			 * we don't really need, or want the "zone"
--- 181,187 ----
  		tseg->direct = isc_boolean_true;
  		tseg->strlen = strlen(tseg->sql);
  
! 		/* check if we encountered "$zone$" token */
  		if (strcasecmp(tseg->sql, "zone") == 0) {
  			/*
  			 * we don't really need, or want the "zone"
***************
*** 194,200 ****
  			/* tseg->sql points in-directly to a string */
  			tseg->direct = isc_boolean_false;
  			foundzone = isc_boolean_true;
! 			/* check if we encountered "%record%" token */
  		} else if (strcasecmp(tseg->sql, "record") == 0) {
  			/*
  			 * we don't really need, or want the "record"
--- 194,200 ----
  			/* tseg->sql points in-directly to a string */
  			tseg->direct = isc_boolean_false;
  			foundzone = isc_boolean_true;
! 			/* check if we encountered "$record$" token */
  		} else if (strcasecmp(tseg->sql, "record") == 0) {
  			/*
  			 * we don't really need, or want the "record"
***************
*** 207,213 ****
  			/* tseg->sql points in-directly poinsts to a string */
  			tseg->direct = isc_boolean_false;
  			foundrecord = isc_boolean_true;
! 			/* check if we encountered "%client%" token */
  		} else if (strcasecmp(tseg->sql, "client") == 0) {
  			/*
  			 * we don't really need, or want the "client"
--- 207,213 ----
  			/* tseg->sql points in-directly poinsts to a string */
  			tseg->direct = isc_boolean_false;
  			foundrecord = isc_boolean_true;
! 			/* check if we encountered "$client$" token */
  		} else if (strcasecmp(tseg->sql, "client") == 0) {
  			/*
  			 * we don't really need, or want the "client"
***************
*** 235,241 ****
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token %%client%% not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}
--- 235,241 ----
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token $client$ not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}
***************
*** 245,251 ****
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token %%record%% not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}
--- 245,251 ----
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token $record$ not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}
***************
*** 255,261 ****
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token %%zone%% not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}
--- 255,261 ----
  		/* Write error message to log */
  		isc_log_write(dns_lctx, DNS_LOGCATEGORY_DATABASE,
  			      DNS_LOGMODULE_DLZ, ISC_LOG_ERROR,
! 			      "Required token $zone$ not found.");
  		result = ISC_R_FAILURE;
  		goto flag_fail;
  	}