From c62f01f993b2ab87f357b76c752d45f37d182cbb Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 10 Jan 2018 18:22:36 +0100
Subject: [PATCH] dhcp: address issue found by @marjohn56

PR: https://github.com/opnsense/core/pull/2077
---
 plist                                            | 2 +-
 src/etc/inc/services.inc                         | 2 +-
 src/{sbin => opnsense/scripts/dhcp}/prefixes.php | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)
 rename src/{sbin => opnsense/scripts/dhcp}/prefixes.php (93%)
 mode change 100644 => 100755

diff --git a/plist b/plist
index 56a0c6c47..241f08ab9 100644
--- a/plist
+++ b/plist
@@ -569,6 +569,7 @@
 /usr/local/opnsense/scripts/OPNsense/CaptivePortal/sql/init.sql
 /usr/local/opnsense/scripts/OPNsense/CaptivePortal/strip_template.py
 /usr/local/opnsense/scripts/dhcp/get_leases.py
+/usr/local/opnsense/scripts/dhcp/prefixes.php
 /usr/local/opnsense/scripts/dns/unbound_dhcpd.py
 /usr/local/opnsense/scripts/filter/delete_table.py
 /usr/local/opnsense/scripts/filter/download_geoip.py
@@ -951,7 +952,6 @@
 /usr/local/sbin/ppp-linkup
 /usr/local/sbin/ppp-log-uptime.sh
 /usr/local/sbin/ppp-uptime.sh
-/usr/local/sbin/prefixes.php
 /usr/local/wizard/openvpn.xml
 /usr/local/wizard/system.xml
 /usr/local/www/carp_status.php
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc
index 9aff82d2d..136474c3f 100644
--- a/src/etc/inc/services.inc
+++ b/src/etc/inc/services.inc
@@ -1324,7 +1324,7 @@ EOD;
     /* fire up dhcpd in a chroot */
     if (count($dhcpdv6ifs) > 0) {
         mwexec('/usr/local/sbin/dhcpd -6 -user dhcpd -group dhcpd -chroot /var/dhcpd -cf /etc/dhcpdv6.conf -pf /var/run/dhcpdv6.pid ' . join(' ', $dhcpdv6ifs));
-        mwexec('/usr/local/sbin/dhcpleases6 -c "/usr/local/bin/php -f /usr/local/sbin/prefixes.php|/bin/sh" -l /var/dhcpd/var/db/dhcpd6.leases');
+        mwexec('/usr/local/sbin/dhcpleases6 -c "/usr/local/sbin/prefixes.php|/bin/sh" -l /var/dhcpd/var/db/dhcpd6.leases');
     }
 
     if ($verbose) {
diff --git a/src/sbin/prefixes.php b/src/opnsense/scripts/dhcp/prefixes.php
old mode 100644
new mode 100755
similarity index 93%
rename from src/sbin/prefixes.php
rename to src/opnsense/scripts/dhcp/prefixes.php
index 9952f5ee0..a852c4a66
--- a/src/sbin/prefixes.php
+++ b/src/opnsense/scripts/dhcp/prefixes.php
@@ -1,3 +1,4 @@
+#!/usr/local/bin/php
 <?php
 
 $leases_file = "/var/dhcpd/var/db/dhcpd6.leases";
@@ -60,7 +61,8 @@ foreach ($duid_arr as $entry) {
 // echo "add routes\n";
 if (count($routes) > 0) {
     foreach ($routes as $address => $prefix) {
-        echo "/sbin/route change -inet6 {$prefix} {$address}\n";
+        echo "/sbin/route delete -inet6 {$prefix} {$address}\n";
+        echo "/sbin/route add -inet6 {$prefix} {$address}\n";
     }
 }