summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2015-07-30 14:58:28 -0400
committerThomas Markwalder <tmark@isc.org>2015-07-30 14:58:28 -0400
commit253f67ae7fc1325f37e5e31efdc432408e5b55c6 (patch)
treec0a6acc5f87c840458a2502a953db4714c526254
parent2932b357ce875ce8bed2a4482c7529b2ee6ceeb9 (diff)
downloadisc-dhcp-253f67ae7fc1325f37e5e31efdc432408e5b55c6.tar.gz
[master] Fixed broken build under HP-UX due to ldap.c inclusion of ifaddrs.h
Merges isn 40200.
-rw-r--r--server/ldap.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/server/ldap.c b/server/ldap.c
index f778599e..b3eba57d 100644
--- a/server/ldap.c
+++ b/server/ldap.c
@@ -38,16 +38,17 @@
*/
#include "dhcpd.h"
+#if defined(LDAP_CONFIGURATION)
#include <signal.h>
#include <errno.h>
#include <ctype.h>
#include <netdb.h>
#include <net/if.h>
+#if defined(HAVE_IFADDRS_H)
#include <ifaddrs.h>
+#endif
#include <string.h>
-#if defined(LDAP_CONFIGURATION)
-
#if defined(LDAP_CASA_AUTH)
#include "ldap_casa.h"
#endif
@@ -283,6 +284,7 @@ get_host_entry(char *fqdnname, size_t fqdnname_size,
return 0;
}
+#if defined(HAVE_IFADDRS_H)
static int
is_iface_address(struct ifaddrs *addrs, struct in_addr *addr)
{
@@ -375,6 +377,7 @@ get_host_address(const char *hostname, char *hostaddr, size_t hostaddr_size, str
}
return -1;
}
+#endif /* HAVE_IFADDRS_H */
static void
ldap_parse_class (struct ldap_config_stack *item, struct parse *cfile)
@@ -828,7 +831,7 @@ ldap_parse_zone (struct ldap_config_stack *item, struct parse *cfile)
item->close_brace = 1;
}
-
+#if defined(HAVE_IFADDRS_H)
static void
ldap_parse_failover (struct ldap_config_stack *item, struct parse *cfile)
{
@@ -1049,6 +1052,7 @@ ldap_parse_failover (struct ldap_config_stack *item, struct parse *cfile)
item->close_brace = 1;
}
+#endif /* HAVE_IFADDRS_H */
static void
add_to_config_stack (LDAPMessage * res, LDAPMessage * ent)
@@ -1966,8 +1970,10 @@ ldap_generate_config_string (struct parse *cfile)
ldap_parse_key (entry, cfile);
else if (strcasecmp (objectClass[i]->bv_val, "dhcpDnsZone") == 0)
ldap_parse_zone (entry, cfile);
+#if defined(HAVE_IFADDRS_H)
else if (strcasecmp (objectClass[i]->bv_val, "dhcpFailOverPeer") == 0)
ldap_parse_failover (entry, cfile);
+#endif
else if (strcasecmp (objectClass[i]->bv_val, "dhcpHost") == 0)
{
if (ldap_method == LDAP_METHOD_STATIC)