2 files changed, 12 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 3ad1c306d..8258b3b9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,15 @@
    - stevesk@cvs.openbsd.org 2005/10/15 15:28:12
      [sshconnect.c]
      make external definition static; ok deraadt@
+   - stevesk@cvs.openbsd.org 2005/10/17 13:45:05
+     [dns.c]
+     fix memory leaks from 2 sources:
+         1) key_fingerprint_raw()
+         2) malloc in dns_read_rdata()
+     ok jakob@
+   - stevesk@cvs.openbsd.org 2005/10/17 14:01:28
+     [dns.c]
+     remove #ifdef LWRES; ok jakob@
 
 20051102
  - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3175,4 +3184,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3937 2005/11/05 04:08:57 djm Exp $
+$Id: ChangeLog,v 1.3938 2005/11/05 04:10:42 djm Exp $
diff --git a/dns.c b/dns.c
index 4ff9ef3f4..d73fdb256 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $        */
+/*      $OpenBSD: dns.c,v 1.15 2005/10/17 14:01:28 stevesk Exp $        */
 
 /*
  * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -29,21 +29,15 @@
 #include "includes.h"
 
 #include <openssl/bn.h>
-#ifdef LWRES
-#include <lwres/netdb.h>
-#include <dns/result.h>
-#else /* LWRES */
 #include <netdb.h>
-#endif /* LWRES */
 
 #include "xmalloc.h"
 #include "key.h"
 #include "dns.h"
 #include "log.h"
 
-RCSID("$OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $");
+RCSID("$OpenBSD: dns.c,v 1.15 2005/10/17 14:01:28 stevesk Exp $");
 
-#ifndef LWRES
 static const char *errset_text[] = {
         "success",              /* 0 ERRSET_SUCCESS */
         "out of memory",        /* 1 ERRSET_NOMEMORY */
@@ -73,8 +67,6 @@ dns_result_totext(unsigned int res)
                 return "unknown error";
         }
 }
-#endif /* LWRES */
-
 
 /*
  * Read SSHFP parameters from key buffer.