summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--dns.c12
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 @@
42 - stevesk@cvs.openbsd.org 2005/10/15 15:28:12 42 - stevesk@cvs.openbsd.org 2005/10/15 15:28:12
43 [sshconnect.c] 43 [sshconnect.c]
44 make external definition static; ok deraadt@ 44 make external definition static; ok deraadt@
45 - stevesk@cvs.openbsd.org 2005/10/17 13:45:05
46 [dns.c]
47 fix memory leaks from 2 sources:
48 1) key_fingerprint_raw()
49 2) malloc in dns_read_rdata()
50 ok jakob@
51 - stevesk@cvs.openbsd.org 2005/10/17 14:01:28
52 [dns.c]
53 remove #ifdef LWRES; ok jakob@
45 54
4620051102 5520051102
47 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 56 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3175,4 +3184,4 @@
3175 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3184 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3176 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3185 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3177 3186
3178$Id: ChangeLog,v 1.3937 2005/11/05 04:08:57 djm Exp $ 3187$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 @@
1/* $OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $ */ 1/* $OpenBSD: dns.c,v 1.15 2005/10/17 14:01:28 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -29,21 +29,15 @@
29#include "includes.h" 29#include "includes.h"
30 30
31#include <openssl/bn.h> 31#include <openssl/bn.h>
32#ifdef LWRES
33#include <lwres/netdb.h>
34#include <dns/result.h>
35#else /* LWRES */
36#include <netdb.h> 32#include <netdb.h>
37#endif /* LWRES */
38 33
39#include "xmalloc.h" 34#include "xmalloc.h"
40#include "key.h" 35#include "key.h"
41#include "dns.h" 36#include "dns.h"
42#include "log.h" 37#include "log.h"
43 38
44RCSID("$OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $"); 39RCSID("$OpenBSD: dns.c,v 1.15 2005/10/17 14:01:28 stevesk Exp $");
45 40
46#ifndef LWRES
47static const char *errset_text[] = { 41static const char *errset_text[] = {
48 "success", /* 0 ERRSET_SUCCESS */ 42 "success", /* 0 ERRSET_SUCCESS */
49 "out of memory", /* 1 ERRSET_NOMEMORY */ 43 "out of memory", /* 1 ERRSET_NOMEMORY */
@@ -73,8 +67,6 @@ dns_result_totext(unsigned int res)
73 return "unknown error"; 67 return "unknown error";
74 } 68 }
75} 69}
76#endif /* LWRES */
77
78 70
79/* 71/*
80 * Read SSHFP parameters from key buffer. 72 * Read SSHFP parameters from key buffer.