From cc18336d35ff381cd13f51320d491637da4f03cc Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 15 Sep 2016 15:48:55 +0200
Subject: [PATCH] (captive portal) when using multiple zones, uninstall the
 correct zone directories

---
 src/etc/rc.d/captiveportal | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/rc.d/captiveportal b/src/etc/rc.d/captiveportal
index c7d1bd7ca..419fedcff 100755
--- a/src/etc/rc.d/captiveportal
+++ b/src/etc/rc.d/captiveportal
@@ -95,17 +95,17 @@ captiveportal_start()
         for installed_zoneid in `ls $CPWORKDIR |  sed 's/zone//g'`
         do
             if [ -d $CPWORKDIR/zone$installed_zoneid ]; then
+                is_installed=0
                 for zoneid in $CPZONES
                 do
-                    is_installed=0
                     if [ "$zoneid" -eq "$installed_zoneid" ]; then
                         is_installed=1
                     fi
-                    if [ "$is_installed" -eq 0 ]; then
-                        echo "Uninstall : zone $installed_zoneid"
-                        rm -rf "$CPWORKDIR/zone$installed_zoneid"
-                    fi
                 done
+                if [ "$is_installed" -eq 0 ]; then
+                    echo "Uninstall : zone $installed_zoneid"
+                    rm -rf "$CPWORKDIR/zone$installed_zoneid"
+                fi
             fi
         done
         echo "start captiveportal background process"