From 8e28b78c65d333d05bcac2d580ad1a6fd4912e2d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Thu, 26 Jul 2018 14:53:47 +0000
Subject: [PATCH] system: better authserver parsing for #2578

---
 src/www/system_usermanager.php             | 17 +++++++++++++----
 src/www/system_usermanager_import_ldap.php | 10 ++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/www/system_usermanager.php b/src/www/system_usermanager.php
index 50797a278..66484235b 100644
--- a/src/www/system_usermanager.php
+++ b/src/www/system_usermanager.php
@@ -1047,16 +1047,25 @@ $( document ).ready(function() {
                       </td>
                       <td class="text-nowrap">
 <?php
-                        $authcfg_type = auth_get_authserver($config['system']['webgui']['authmode'])['type'];
-                        if ($authcfg_type == 'ldap') :?>
+                        $can_import = false;
+                        if (!empty($config['system']['webgui']['authmode'])) {
+                            $servers = explode(',', $config['system']['webgui']['authmode']);
+                            foreach ($servers as $server) {
+                                $authcfg_type = auth_get_authserver($server)['type'];
+                                if ($authcfg_type == 'ldap') {
+                                    $can_import = true;
+                                }
+                            }
+                        }
+?>
+<?php if ($can_import): ?>
                           <button type="submit" name="import"
                                   id="import_ldap_users"
                                   class="btn btn-default btn-xs"
                                   title="<?=gettext("import users")?>">
                               <i class="fa fa-cloud-download fa-fw"></i>
                           </button>
-<?php
-                      endif;?>
+<?php endif ?>
                       </td>
                     </tr>
                   </tbody>
diff --git a/src/www/system_usermanager_import_ldap.php b/src/www/system_usermanager_import_ldap.php
index 1f2ef6207..f802a141e 100644
--- a/src/www/system_usermanager_import_ldap.php
+++ b/src/www/system_usermanager_import_ldap.php
@@ -63,8 +63,14 @@ $ldap_users= array();
 $ldap_is_connected = false;
 $exit_form = false;
 
-// find gui auth server
-$authcfg = auth_get_authserver($config['system']['webgui']['authmode']);
+// XXX find first LDAP GUI auth server, better select later on
+$servers = explode(',', $config['system']['webgui']['authmode']);
+foreach ($servers as $server) {
+    $authcfg = auth_get_authserver($server);
+    if ($authcfg['type'] == 'ldap') {
+        break;
+    }
+}
 
 if ($authcfg['type'] == 'ldap') {
     // setup peer ca