summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2015-02-20 15:48:53 +0100
committerDaniil Baturin <daniil@baturin.org>2015-02-20 15:48:53 +0100
commitecb11362e4b99540c004c24df5be64dd0d4b3795 (patch)
treeaaddc98b325f455970d5645e359cf23706ed5eb0
parentef75c856162976290dca8c089030319fe3b5a87c (diff)
downloadvyatta-cfg-system-ecb11362e4b99540c004c24df5be64dd0d4b3795.tar.gz
vyatta-cfg-system-ecb11362e4b99540c004c24df5be64dd0d4b3795.zip
Bug #491: don't allow temporary and parameters-only
DHCPv6 options to be configured at the same time.
-rwxr-xr-xscripts/vyatta-dhcpv6-client.pl5
1 files changed, 5 insertions, 0 deletions
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" : "";