Commit 3ceffe96 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

dnsmasq: bump to version 2.65

parent 37f82a44
Loading
Loading
Loading
Loading
+0 −37
Original line number Diff line number Diff line
From acd702292afebb8550acbfbe80638995545ccd10 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Mon, 10 Dec 2012 07:47:10 -0300
Subject: [PATCH] Move parse_server outside the HAVE_DHCP ifdef

Fixes build breakage when building without DHCP support.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 src/option.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/option.c b/src/option.c
index c1643a1..d6e323b 100644
--- a/src/option.c
+++ b/src/option.c
@@ -641,6 +641,8 @@ static char *set_prefix(char *arg)
    return arg;
 }
 
+#endif
+
 char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_addr, char *interface, int *flags)
 {
   int source_port = 0, serv_port = NAMESERVER_PORT;
@@ -728,6 +730,8 @@ char *parse_server(char *arg, union mysockaddr *addr, union mysockaddr *source_a
   return NULL;
 }
 
+#ifdef HAVE_DHCP
+
 /* This is too insanely large to keep in-line in the switch */
 static int parse_dhcp_opt(char *errstr, char *arg, int flags)
 {
-- 
1.7.8.6
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#
#############################################################

DNSMASQ_VERSION = 2.64
DNSMASQ_VERSION = 2.65
DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)"
DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"