From ecb11362e4b99540c004c24df5be64dd0d4b3795 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@baturin.org>
Date: Fri, 20 Feb 2015 15:48:53 +0100
Subject: Bug #491: don't allow temporary and parameters-only DHCPv6 options to
 be configured at the same time.

---
 scripts/vyatta-dhcpv6-client.pl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/vyatta-dhcpv6-client.pl b/scripts/vyatta-dhcpv6-client.pl
index ccedb01c..45318aef 100755
--- a/scripts/vyatta-dhcpv6-client.pl
+++ b/scripts/vyatta-dhcpv6-client.pl
@@ -130,6 +130,11 @@ if (defined($start_flag) || defined ($renew_flag)) {
     printf("Stopping old daemon...\n");
     system("$cmdname -6 -pf $pidfile -x $ifname");
 
+    if (defined($temporary) && defined($params_only)) {
+        print "Error: temporary and parameters-only options are mutually exclusive!\n";
+        exit 1;
+    }
+
     my $temp_opt = defined($temporary) ? "-T" : "";
     my $po_opt = defined($params_only) ? "-S" : "";
 
-- 
cgit v1.2.3