From 3a44d7328369c13e672e2de77db33d2ddd97aed2 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 4 Aug 2016 14:40:49 +0200
Subject: [PATCH] (ipsec) cleanup, unused "allusers"

---
 src/etc/inc/ipsec.inc      | 6 +-----
 src/www/vpn_ipsec_keys.php | 3 +--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/etc/inc/ipsec.inc b/src/etc/inc/ipsec.inc
index d54b19949..bebcf1441 100644
--- a/src/etc/inc/ipsec.inc
+++ b/src/etc/inc/ipsec.inc
@@ -808,9 +808,8 @@ EOD;
                 }
 
                 $myid = isset($ph1ent['mobile']) ? trim($myid_data) . " " : "";
-                $peerid = ($peerid_data != "allusers") ? trim($peerid_data) : "";
                 if (!empty($ph1ent['pre-shared-key'])) {
-                    $pskconf .= $myid . $peerid . " : PSK \"" . trim($ph1ent['pre-shared-key']) . "\"\n";
+                    $pskconf .= $myid . trim($peerid_data) . " : PSK \"" . trim($ph1ent['pre-shared-key']) . "\"\n";
                 }
             }
         }
@@ -828,9 +827,6 @@ EOD;
         /* add PSKs for mobile clients */
         if (isset($ipseccfg['mobilekey'])) {
             foreach ($ipseccfg['mobilekey'] as $key) {
-                if ($key['ident'] == "allusers") {
-                    $key['ident'] = '';
-                }
                 $pskconf .= "{$key['ident']} : PSK \"{$key['pre-shared-key']}\"\n";
             }
             unset($key);
diff --git a/src/www/vpn_ipsec_keys.php b/src/www/vpn_ipsec_keys.php
index ae8c95c3c..6c2725a67 100644
--- a/src/www/vpn_ipsec_keys.php
+++ b/src/www/vpn_ipsec_keys.php
@@ -132,14 +132,13 @@ if (is_subsystem_dirty('ipsec')) {
 foreach ($config['system']['user'] as $id => $user) {
     if (!empty($user['ipsecpsk'])) {
         $userkeys[] = array('ident' => $user['name'], 'pre-shared-key' => $user['ipsecpsk'], 'id' => $id);
-        ;
     }
 }
 foreach ($userkeys as $secretent) :
 ?>
 <tr>
   <td>
-    <?=$secretent['ident'] == 'allusers' ? gettext("ANY USER") : htmlspecialchars($secretent['ident']) ;?>
+    <?=htmlspecialchars($secretent['ident']) ;?>
   </td>
   <td>
     <?=htmlspecialchars($secretent['pre-shared-key']);?>