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() { + $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; + } + } + } +?> + - + 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