ldap: further tweaks according to user feedback

Puts LDAP back in into its supposed working state.

src/opnsense/mvc/app/library/OPNsense/Auth/LDAP.php

@@ -126,17 +126,28 @@ class LDAP implements IAuthConnector
     {
         $result = false;
         if ($this->ldapHandle != null) {
-            // if we're looking at multple dn's, split and combine output
+            $searchpaths = array();
             if (!empty($this->ldapAuthcontainers)) {
-                $searchpaths = $this->ldapAuthcontainers;
+                /* prepend each authentication container */
+                foreach (explode(';', $this->ldapAuthcontainers) as $container) {
+                    $searchpath = array();
+                    if (!empty($container)) {
+                        $searchpath[] = $container;
+                    }
+                    if (!empty($this->baseSearchDN)) {
+                        $searchpath[] = $this->baseSearchDN;
+                    }
+                    $searchpaths[] = implode(',', $searchpath);
+                }
             } else {
-                $searchpaths = $this->baseSearchDN;
+                /* use a single base DN */
+                $searchpaths[] = $this->baseSearchDN;
             }
-            foreach (explode(";", $searchpaths) as $baseDN) {
-                if ($this->ldapScope == "one") {
-                    $sr=@ldap_list($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
+            foreach ($searchpaths as $baseDN) {
+                if ($this->ldapScope == 'one') {
+                    $sr = @ldap_list($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
                 } else {
-                    $sr=@ldap_search($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
+                    $sr = @ldap_search($this->ldapHandle, $baseDN, $filter, $this->ldapSearchAttr);
                 }
                 if ($sr !== false) {
                     $info = @ldap_get_entries($this->ldapHandle, $sr);

src/wizard/openvpn.xml

@@ -205,7 +205,7 @@
 			<displayname>User Naming Attribute</displayname>
 			<type>input</type>
 			<bindstofield>ovpnserver->step2->nameattr</bindstofield>
-			<description>Typically "cn" (OpenLDAP, Novell eDirectory), "samAccountName" (Microsoft AD)</description>
+			<description>Typically "cn" (OpenLDAP, Novell eDirectory), "sAMAccountName" (Microsoft AD)</description>
 		</field>
 		<field>
 			<name>groupattr</name>

src/www/system_authservers.php

@@ -333,7 +333,7 @@ $( document ).ready(function() {
               $("#ldap_attr_user").val('cn');
               break;
             case 'msad':
-              $("#ldap_attr_user").val('samAccountName');
+              $("#ldap_attr_user").val('sAMAccountName');
               break;
         }
     });
@@ -604,9 +604,12 @@ endif; ?>
 <?php
 endif; ?>
                 <tr class="auth_ldap auth_options hidden">
-                  <td><i class="fa fa-info-circle text-muted"></i> <?=gettext("User naming attribute");?></td>
+                  <td><a id="help_for_ldap_attr_user" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("User naming attribute");?></td>
                   <td>
                     <input name="ldap_attr_user" type="text" id="ldap_attr_user" size="20" value="<?=$pconfig['ldap_attr_user'];?>"/>
+                    <div class="hidden" for="help_for_ldap_attr_user">
+                      <?= gettext('Typically "cn" (OpenLDAP, Novell eDirectory), "sAMAccountName" (Microsoft AD)') ?>
+                    </div>
                   </td>
                 </tr>
                 <!-- RADIUS -->