From 978695e191bc3e66975afb420fc895c8b736c7b1 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Fri, 20 Feb 2015 16:08:38 +0100
Subject: [PATCH] remove ipv6 fcgi-fpm leftovers

---
 src/etc/inc/interfaces.inc |  4 +---
 src/etc/rc.newwanipv6      | 15 +++------------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index bc3112415..0729654dc 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -3606,9 +3606,7 @@ function interface_dhcpv6_configure($interface = "wan", $wancfg) {
 
 	$dhcp6cscript = "#!/bin/sh\n";
 	$dhcp6cscript .= "# This shell script launches /usr/local/etc/rc.newwanipv6 with a interface argument.\n";
-	$dhcp6cscript .= "dmips=\${new_domain_name_servers}\n";
-	$dhcp6cscript .= "dmnames=\${new_domain_name}\n";
-	$dhcp6cscript .= "/usr/local/sbin/fcgicli -f /usr/local/etc/rc.newwanipv6 -d \"interface={$wanif}&dmnames=\${dmnames}&dmips=\${dmips}\"\n";
+	$dhcp6cscript .= "/etc/rc.newwanipv6 {$wanif} \n";
 	/* Add wide-dhcp6c shell script here. Because we can not pass a argument to it. */
 	if (!@file_put_contents("{$g['varetc_path']}/dhcp6c_{$interface}_script.sh", $dhcp6cscript)) {
 		printf("Error: cannot open dhcp6c_{$interface}_script.sh in interface_dhcpv6_configure() for writing.\n");
diff --git a/src/etc/rc.newwanipv6 b/src/etc/rc.newwanipv6
index a85a749de..4def04166 100755
--- a/src/etc/rc.newwanipv6
+++ b/src/etc/rc.newwanipv6
@@ -55,10 +55,7 @@ function restart_packages() {
 }
 
 /* Interface IP address has changed */
-if (isset($_GET))
-	$argument = $_GET['interface'];
-else
-	$argument = trim($argv[1], " \n\t");
+$argument = trim($argv[1], " \n\t");
 
 log_error("rc.newwanipv6: Informational is starting {$argument}.");
 
@@ -94,10 +91,7 @@ if ((empty($curwanipv6) || !is_ipaddrv6($curwanipv6)) && substr($interface_real,
         return;
 }
 
-if (isset($_GET))
-	$new_domain_name_servers = $_GET['dmips'];
-else
-	$new_domain_name_servers = getenv("new_domain_name_servers");
+$new_domain_name_servers = getenv("new_domain_name_servers");
 if (!empty($new_domain_name_servers)) {
 	$name_servers = explode(" ", $new_domain_name_servers);
 	$valid_ns = array();
@@ -109,10 +103,7 @@ if (!empty($new_domain_name_servers)) {
 	if (count($valid_ns > 0))
 		file_put_contents("{$g['varetc_path']}/nameserver_v6{$interface}", implode("\n", $valid_ns));
 }
-if (isset($_GET))
-	$new_domain_name = $_GET['dmnames'];
-else
-	$new_domain_name = getenv("new_domain_name");
+$new_domain_name = getenv("new_domain_name");
 if (!empty($new_domain_name))
 	file_put_contents("{$g['varetc_path']}/searchdomain_v6{$interface}", $new_domain_name);