From 995265d4a64df5d57cdaa61ca841cc49c3d1b440 Mon Sep 17 00:00:00 2001
From: Jake Guffey <jake.guffey@eprotex.com>
Date: Wed, 19 Sep 2012 16:42:15 -0400
Subject: [PATCH] Allow pfctl -[de] to return 1

If pf is already enabled or disabled and we try to enable/disable it again, it returns 1.
---
 conf/type/__pf_apply/gencode-remote | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf/type/__pf_apply/gencode-remote b/conf/type/__pf_apply/gencode-remote
index 83529859..72200b59 100755
--- a/conf/type/__pf_apply/gencode-remote
+++ b/conf/type/__pf_apply/gencode-remote
@@ -29,6 +29,8 @@ rcvar=$(cat "$__object/explorer/rcvar")
 
 cat <<EOF
 if [ -f "${rcvar}.old" ]; then # rcvar.old exists, we must need to disable pf
+   # Disable pf
+   # If it already is disabled, pfctl -d returns 1, go on with life
    pfctl -d
    # Cleanup
    rm -f "${rcvar}.old
@@ -36,7 +38,8 @@ if [ -f "${rcvar}.old" ]; then # rcvar.old exists, we must need to disable pf
    [ -f "${rcvar}" ] && rm -f "${rcvar}"
 elif [ -f "${rcvar}.new" ]; then # rcvar.new exists, we must need to apply it
    # Ensure that pf is enabled in the first place
-   pfctl -e
+   # If it already is enabled, pfctl -e returns 1, go on with life
+   pfctl -e || true
    pfctl -f "${rcvar}"
    ret="$?"
    # Cleanup