diff -ru asterisk-1.6.2.1_orig/include/asterisk/dnsmgr.h asterisk-1.6.2.1/include/asterisk/dnsmgr.h
--- asterisk-1.6.2.1_orig/include/asterisk/dnsmgr.h	2009-03-09 16:58:17.000000000 -0400
+++ asterisk-1.6.2.1/include/asterisk/dnsmgr.h	2010-02-18 15:06:19.000000000 -0500
@@ -42,12 +42,12 @@
  *
  * \param name the hostname
  * \param result where the DNS manager should store the IP address as it refreshes it.
- *      it.
+ * \param service SRV prefix (optional, set to NULL to disable SRV)
  *
  * This function allocates a new DNS manager entry object, and fills it with the
  * provided hostname and IP address.  This function does not force an initial lookup
- * of the IP address.  So, generally, this should be used when the initial address
- * is already known.
+ * of the IP address.  So, this should be used when the initial address
+ * is already known and stored in result.
  *
  * \return a DNS manager entry
  * \version 1.6.1 result changed from struct in_addr to struct sockaddr_in to store port number
@@ -69,6 +69,7 @@
  * \param name the hostname
  * \param result where to store the IP address as the DNS manager refreshes it
  * \param dnsmgr Where to store the allocate DNS manager entry
+ * \param service SRV prefix (optional, set to NULL to disable SRV)
  *
  * This function allocates a new DNS manager entry object, and fills it with
  * the provided hostname and IP address.  This function _does_ force an initial
diff -ru asterisk-1.6.2.1_orig/main/acl.c asterisk-1.6.2.1/main/acl.c
--- asterisk-1.6.2.1_orig/main/acl.c	2009-12-02 12:01:17.000000000 -0500
+++ asterisk-1.6.2.1/main/acl.c	2010-02-18 16:09:24.000000000 -0500
@@ -380,6 +380,7 @@
 		}
 	}
 	if ((hp = ast_gethostbyname(value, &ahp))) {
+		sin->sin_family = hp->h_addrtype;
 		memcpy(&sin->sin_addr, hp->h_addr, sizeof(sin->sin_addr));
 	} else {
 		ast_log(LOG_WARNING, "Unable to lookup '%s'\n", value);
diff -ru asterisk-1.6.2.1_orig/main/dnsmgr.c asterisk-1.6.2.1/main/dnsmgr.c
--- asterisk-1.6.2.1_orig/main/dnsmgr.c	2009-08-10 15:36:38.000000000 -0400
+++ asterisk-1.6.2.1/main/dnsmgr.c	2010-02-19 11:21:23.000000000 -0500
@@ -52,8 +52,6 @@
 struct ast_dnsmgr_entry {
 	/*! where we will store the resulting IP address and port number */
 	struct sockaddr_in *result;
-	/*! the last result, used to check if address/port has changed */
-	struct sockaddr_in last;
 	/*! SRV record to lookup, if provided. Composed of service, protocol, and domain name: _Service._Proto.Name */
 	char *service;
 	/*! Set to 1 if the entry changes */
@@ -85,6 +83,9 @@
 	.verbose = 0,
 };
 
+/* 
+ * Allocate a new DNS manager entry
+ */
 struct ast_dnsmgr_entry *ast_dnsmgr_get(const char *name, struct sockaddr_in *result, const char *service)
 {
 	struct ast_dnsmgr_entry *entry;
@@ -96,7 +97,6 @@
 	entry->result = result;
 	ast_mutex_init(&entry->lock);
 	strcpy(entry->name, name);
-	memcpy(&entry->last, result, sizeof(entry->last));
 	if (service) {
 		entry->service = ((char *) entry) + sizeof(*entry) + strlen(name);
 		strcpy(entry->service, service);
@@ -109,6 +109,9 @@
 	return entry;
 }
 
+/* 
+ * Free a DNS manager entry
+ */
 void ast_dnsmgr_release(struct ast_dnsmgr_entry *entry)
 {
 	if (!entry)
@@ -123,6 +126,9 @@
 	ast_free(entry);
 }
 
+/* 
+ * Allocate a new DNS manager entry and perform the initial lookup before returning
+ */
 int ast_dnsmgr_lookup(const char *name, struct sockaddr_in *result, struct ast_dnsmgr_entry **dnsmgr, const char *service)
 {
 	if (ast_strlen_zero(name) || !result || !dnsmgr)
@@ -133,8 +139,10 @@
 
 	/* if it's actually an IP address and not a name,
 	   there's no need for a managed lookup */
-	if (inet_aton(name, &result->sin_addr))
+	if (inet_aton(name, &result->sin_addr)) {
+		result->sin_family = AF_INET;
 		return 0;
+		}
 
 	ast_verb(4, "doing dnsmgr_lookup for '%s'\n", name);
 
@@ -151,7 +159,7 @@
 }
 
 /*
- * Refresh a dnsmgr entry
+ * Force a refresh of a dnsmgr entry
  */
 static int dnsmgr_refresh(struct ast_dnsmgr_entry *entry, int verbose)
 {
@@ -164,15 +172,15 @@
 	if (verbose)
 		ast_verb(3, "refreshing '%s'\n", entry->name);
 
-	tmp.sin_port = entry->last.sin_port;
+	memset(&tmp, 0, sizeof(tmp));
+	tmp.sin_port = entry->result->sin_port;
 	
-	if (!ast_get_ip_or_srv(&tmp, entry->name, entry->service) && inaddrcmp(&tmp, &entry->last)) {
-		ast_copy_string(iabuf, ast_inet_ntoa(entry->last.sin_addr), sizeof(iabuf));
+	if (!ast_get_ip_or_srv(&tmp, entry->name, entry->service) && inaddrcmp(&tmp, entry->result)) {
+		ast_copy_string(iabuf, ast_inet_ntoa(entry->result->sin_addr), sizeof(iabuf));
 		ast_copy_string(iabuf2, ast_inet_ntoa(tmp.sin_addr), sizeof(iabuf2));
 		ast_log(LOG_NOTICE, "dnssrv: host '%s' changed from %s:%d to %s:%d\n", 
-			entry->name, iabuf, ntohs(entry->last.sin_port), iabuf2, ntohs(tmp.sin_port));
+			entry->name, iabuf, ntohs(entry->result->sin_port), iabuf2, ntohs(tmp.sin_port));
 		*entry->result = tmp;
-		entry->last = tmp;
 		changed = entry->changed = 1;
 	}