summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/getrrsetbyname.c4
-rw-r--r--openbsd-compat/getrrsetbyname.h7
3 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index bb1a2d9c5..bf783a367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,7 @@
48 - (djm) Adapt README.dns for portable 48 - (djm) Adapt README.dns for portable
49 - (djm) Avoid uuencode.c warnings 49 - (djm) Avoid uuencode.c warnings
50 - (djm) Enable UsePAM when built --with-pam 50 - (djm) Enable UsePAM when built --with-pam
51 51 - (djm) Only build getrrsetbyname replacement when using --with-dns
5220030514 5220030514
53 - (djm) Bug #117: Don't lie to PAM about username 53 - (djm) Bug #117: Don't lie to PAM about username
54 - (djm) RCSID sync w/ OpenBSD 54 - (djm) RCSID sync w/ OpenBSD
@@ -1523,4 +1523,4 @@
1523 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1523 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1524 ok provos@ 1524 ok provos@
1525 1525
1526$Id: ChangeLog,v 1.2719 2003/05/15 04:17:28 djm Exp $ 1526$Id: ChangeLog,v 1.2720 2003/05/15 10:55:27 djm Exp $
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 03637c9ef..1a4d9c14b 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -45,7 +45,7 @@
45 45
46#include "includes.h" 46#include "includes.h"
47 47
48#ifndef HAVE_GETRRSETBYNAME 48#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
49 49
50#include "getrrsetbyname.h" 50#include "getrrsetbyname.h"
51 51
@@ -564,4 +564,4 @@ count_dns_rr(struct dns_rr *p, u_int16_t class, u_int16_t type)
564 return (n); 564 return (n);
565} 565}
566 566
567#endif /* HAVE_GETRRSETBYNAME */ 567#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 048280192..9edaf0ae2 100644
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -18,7 +18,7 @@
18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, 20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT 21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -48,7 +48,7 @@
48 48
49#include "config.h" 49#include "config.h"
50 50
51#ifndef HAVE_GETRRSETBYNAME 51#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
52 52
53#include <sys/types.h> 53#include <sys/types.h>
54#include <netinet/in.h> 54#include <netinet/in.h>
@@ -95,5 +95,6 @@ struct rrsetinfo {
95int getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **); 95int getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
96void freerrset(struct rrsetinfo *); 96void freerrset(struct rrsetinfo *);
97 97
98#endif /* HAVE_GETRRSETBYNAME */ 98#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */
99
99#endif /* _GETRRSETBYNAME_H */ 100#endif /* _GETRRSETBYNAME_H */