From a90b6f7d900a0dab358ecb56dd78c127a8797452 Mon Sep 17 00:00:00 2001
From: Steven Barth <cyrus@openwrt.org>
Date: Tue, 26 Feb 2013 12:50:52 +0000
Subject: [PATCH] 6relayd: Fix config behaviour for rewrite_dns_addr option

SVN-Revision: 35804
---
 package/network/ipv6/6relayd/Makefile           | 2 +-
 package/network/ipv6/6relayd/files/6relayd.init | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 790f5e2772..8fe7977800 100644
--- a/package/network/ipv6/6relayd/Makefile
+++ b/package/network/ipv6/6relayd/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6relayd
-PKG_VERSION:=2013-02-26
+PKG_VERSION:=2013-02-26.1
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/package/network/ipv6/6relayd/files/6relayd.init b/package/network/ipv6/6relayd/files/6relayd.init
index 410164a9d7..ef0c711224 100644
--- a/package/network/ipv6/6relayd/files/6relayd.init
+++ b/package/network/ipv6/6relayd/files/6relayd.init
@@ -69,7 +69,7 @@ start_6relayd() {
 	local always_rewrite_dns rewrite_dns_addr
 	config_get_bool always_rewrite_dns "$cfg" always_rewrite_dns 0
 	config_get rewrite_dns_addr "$cfg" rewrite_dns_addr
-	[ "$always_rewrite_dns" -eq 1 ] && append args "-n$rewrite_dns_addr"
+	[ "$always_rewrite_dns" -eq 1 -o -n "$rewrite_dns_addr" ] && append args "-n$rewrite_dns_addr"
 
 	local always_assume_default
 	config_get_bool always_assume_default "$cfg" always_assume_default 0
-- 
GitLab