From 91543f4831fcbc54b56fcbcdaa6a3bb2e503be64 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Mon, 23 Sep 2013 12:41:20 +0100
Subject: [PATCH] Fix FTBFS when various facilities omitted at compile time.

---
 src/lease.c   | 9 ++++++++-
 src/network.c | 4 +++-
 src/tftp.c    | 2 --
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/lease.c b/src/lease.c
index 7033370..02ca094 100644
--- a/src/lease.c
+++ b/src/lease.c
@@ -462,7 +462,6 @@ void lease_update_dns(int force)
 		      cache_add_dhcp_entry(lease->hostname, AF_INET6, (struct all_addr *)&slaac->addr, lease->expires);
 		  }
 	    }
-#endif
 	  
 	  if (lease->fqdn)
 	    cache_add_dhcp_entry(lease->fqdn, prot, 
@@ -473,6 +472,14 @@ void lease_update_dns(int force)
 	    cache_add_dhcp_entry(lease->hostname, prot, 
 				 prot == AF_INET ? (struct all_addr *)&lease->addr : (struct all_addr *)&lease->addr6, 
 				 lease->expires);
+       
+#else
+	  if (lease->fqdn)
+	    cache_add_dhcp_entry(lease->fqdn, prot, (struct all_addr *)&lease->addr, lease->expires);
+	  
+	  if (!option_bool(OPT_DHCP_FQDN) && lease->hostname)
+	    cache_add_dhcp_entry(lease->hostname, prot, (struct all_addr *)&lease->addr, lease->expires);
+#endif
 	}
       
       dns_dirty = 0;
diff --git a/src/network.c b/src/network.c
index 712d7ee..576a7cf 100644
--- a/src/network.c
+++ b/src/network.c
@@ -243,7 +243,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
   int tftp_ok = !!option_bool(OPT_TFTP);
   int dhcp_ok = 1;
   int auth_dns = 0;
-#ifdef HAVE_DHCP
+#if defined(HAVE_DHCP) || defined(HAVE_TFTP)
   struct iname *tmp;
 #endif
 
@@ -362,6 +362,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
 #endif
  
   
+#ifdef HAVE_TFTP
   if (daemon->tftp_interfaces)
     {
       /* dedicated tftp interface list */
@@ -370,6 +371,7 @@ static int iface_allowed(struct iface_param *param, int if_index, char *label,
 	if (tmp->name && wildcard_match(tmp->name, ifr.ifr_name))
 	  tftp_ok = 1;
     }
+#endif
   
   /* add to list */
   if ((iface = whine_malloc(sizeof(struct irec))))
diff --git a/src/tftp.c b/src/tftp.c
index d611dea..d752e71 100644
--- a/src/tftp.c
+++ b/src/tftp.c
@@ -49,9 +49,7 @@ void tftp_request(struct listener *listen, time_t now)
   struct iovec iov;
   struct ifreq ifr;
   int is_err = 1, if_index = 0, mtu = 0;
-#ifdef HAVE_DHCP
   struct iname *tmp;
-#endif
   struct tftp_transfer *transfer;
   int port = daemon->start_tftp_port; /* may be zero to use ephemeral port */
 #if defined(IP_MTU_DISCOVER) && defined(IP_PMTUDISC_DONT)