Merge remote branch 'upstream/master'

Conflicts:
	etc/version

16 files changed, 5 insertions, 5 deletions

diff --git a/usr/local/sbin/ovpn-linkdown b/usr/local/sbin/ovpn-linkdown
index 112317f..b300aed 100755
--- a/usr/local/sbin/ovpn-linkdown
+++ b/usr/local/sbin/ovpn-linkdown
@@ -1,5 +1,5 @@
 #!/bin/sh
-/sbin/pfctl -b $4 -b $5
+# /sbin/pfctl -b $4 -b $5
 # delete the node just in case mpd cannot do that
 /bin/rm -f /var/etc/nameserver_$1
 /bin/rm -f /tmp/$1_router
diff --git a/usr/local/sbin/ovpn-linkup b/usr/local/sbin/ovpn-linkup
index 613822c..b613a9a 100755
--- a/usr/local/sbin/ovpn-linkup
+++ b/usr/local/sbin/ovpn-linkup
@@ -2,10 +2,10 @@
 
 # let the configuration system know that the ip has changed.
 #/usr/local/sbin/pfSctl -c "interface newip $interface"
-if [ -n $route_vpn_gateway ]; then
+if [ "" != "$route_vpn_gateway" ]; then
 	/bin/echo $route_vpn_gateway > /tmp/$1_router
 else
-	/bin/echo $4 > /tmp/$1_router
+	/bin/echo $5 > /tmp/$1_router
 fi
 /usr/bin/touch /tmp/$1up
 # reload filter 
diff --git a/usr/local/sbin/ppp-linkdown b/usr/local/sbin/ppp-linkdown
index f6a78b9..1170d2f 100755
--- a/usr/local/sbin/ppp-linkdown
+++ b/usr/local/sbin/ppp-linkdown
@@ -6,7 +6,7 @@ fi
 if [ -f "/tmp/${interface}_defaultgw" ]; then
 	route delete default $4
 fi
-/sbin/pfctl -b $3 -b $4
+# /sbin/pfctl -b $3 -b $4
 # delete the node just in case mpd cannot do that
 /usr/sbin/ngctl shutdown $1:
 if [ -f "/var/etc/nameserver_$1" ]; then
diff --git a/usr/local/sbin/vpn-linkdown b/usr/local/sbin/vpn-linkdown
index e67a8a0..1d533cb 100755
--- a/usr/local/sbin/vpn-linkdown
+++ b/usr/local/sbin/vpn-linkdown
@@ -2,4 +2,4 @@
 
 # record logout
 /usr/bin/logger -p local3.info "logout,$1,$4,$5"
-/sbin/pfctl -b $3 -b $4
+# /sbin/pfctl -b $3 -b $4
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png b/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-group.png b/usr/local/www/themes/_corporate/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png b/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/_corporate/images/icons/icon_system-user.png b/usr/local/www/themes/_corporate/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/_corporate/images/icons/icon_system-user.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/pfsense-dropdown/images/icons/icon_system-user.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png b/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png
new file mode 100644
index 0000000..d7b964d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-group-grey.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-group.png b/usr/local/www/themes/pfsense/images/icons/icon_system-group.png
new file mode 100644
index 0000000..1c974f2
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-group.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png b/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png
new file mode 100644
index 0000000..2f6047d
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-user-grey.png
diff --git a/usr/local/www/themes/pfsense/images/icons/icon_system-user.png b/usr/local/www/themes/pfsense/images/icons/icon_system-user.png
new file mode 100644
index 0000000..ef82156
--- /dev/null
+++ b/usr/local/www/themes/pfsense/images/icons/icon_system-user.png