summaryrefslogtreecommitdiff
path: root/dns.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-11-05 15:10:42 +1100
committerDamien Miller <djm@mindrot.org>2005-11-05 15:10:42 +1100
commit7e8795d3082de5b0f86728b5ecceff56d69db491 (patch)
tree7c3fd3344f92c0b62b3f9d88a73abeb3b435df3c /dns.c
parent6571249074b1f1af37f51bdbcfb5c0e857903d14 (diff)
- stevesk@cvs.openbsd.org 2005/10/17 14:01:28
[dns.c] remove #ifdef LWRES; ok jakob@
Diffstat (limited to 'dns.c')
-rw-r--r--dns.c12
1 files changed, 2 insertions, 10 deletions
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.