- (djm) Only build getrrsetbyname replacement when using --with-dns
diff --git a/ChangeLog b/ChangeLog
index bb1a2d9..bf783a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,7 +48,7 @@
- (djm) Adapt README.dns for portable
- (djm) Avoid uuencode.c warnings
- (djm) Enable UsePAM when built --with-pam
-
+ - (djm) Only build getrrsetbyname replacement when using --with-dns
20030514
- (djm) Bug #117: Don't lie to PAM about username
- (djm) RCSID sync w/ OpenBSD
@@ -1523,4 +1523,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@
-$Id: ChangeLog,v 1.2719 2003/05/15 04:17:28 djm Exp $
+$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 03637c9..1a4d9c1 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -45,7 +45,7 @@
#include "includes.h"
-#ifndef HAVE_GETRRSETBYNAME
+#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
#include "getrrsetbyname.h"
@@ -564,4 +564,4 @@
return (n);
}
-#endif /* HAVE_GETRRSETBYNAME */
+#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */
diff --git a/openbsd-compat/getrrsetbyname.h b/openbsd-compat/getrrsetbyname.h
index 0482801..9edaf0a 100644
--- a/openbsd-compat/getrrsetbyname.h
+++ b/openbsd-compat/getrrsetbyname.h
@@ -18,7 +18,7 @@
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
@@ -48,7 +48,7 @@
#include "config.h"
-#ifndef HAVE_GETRRSETBYNAME
+#if defined(DNS) && !defined(HAVE_GETRRSETBYNAME)
#include <sys/types.h>
#include <netinet/in.h>
@@ -95,5 +95,6 @@
int getrrsetbyname(const char *, unsigned int, unsigned int, unsigned int, struct rrsetinfo **);
void freerrset(struct rrsetinfo *);
-#endif /* HAVE_GETRRSETBYNAME */
+#endif /* defined(DNS) && !defined(HAVE_GETRRSETBYNAME) */
+
#endif /* _GETRRSETBYNAME_H */