From 55c7ef52aa7064353c580cfdc10a9e69e648545a Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 6 Feb 2014 20:05:47 -0800
Subject: [PATCH] [v9_9] type mismatch in ODBC DLZ driver

3732.	[contrib]	Fixed a type mismatch causing the ODBC DLZ
			driver to dump core on 64-bit systems. [RT #35324]

(cherry picked from commit 41e55d04032c0eefd39d74ffb73657b04fb821ec)
---
 CHANGES                               | 3 +++
 contrib/dlz/drivers/dlz_odbc_driver.c | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index e10a7ed1b2..eb2f5f64fd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3732.	[contrib]	Fixed a type mismatch causing the ODBC DLZ
+			driver to dump core on 64-bit systems. [RT #35324]
+
 3731.	[func]		Added a "no-case-compress" ACL, which causes
 			named to use case-insensitive compression
 			(disabling change #3645) for specified
diff --git a/contrib/dlz/drivers/dlz_odbc_driver.c b/contrib/dlz/drivers/dlz_odbc_driver.c
index 9c1ff4613c..d5026f710c 100644
--- a/contrib/dlz/drivers/dlz_odbc_driver.c
+++ b/contrib/dlz/drivers/dlz_odbc_driver.c
@@ -734,7 +734,7 @@ odbc_get_resultset(const char *zone, const char *record,
 static isc_result_t
 odbc_getField(SQLHSTMT *stmnt, SQLSMALLINT field, char **data) {
 
-	SQLINTEGER size;
+	SQLLEN size;
 
 	REQUIRE(data != NULL && *data == NULL);
 
@@ -763,7 +763,7 @@ odbc_getManyFields(SQLHSTMT *stmnt, SQLSMALLINT startField,
 		   SQLSMALLINT endField, char **retData) {
 
 	isc_result_t result;
-	SQLINTEGER size;
+	SQLLEN size;
 	int totSize = 0;
 	SQLSMALLINT i;
 	int j = 0;