Revert "Fixes #3738 removing Rfc2307 option from setup"

This reverts commit 3c20ca5c.

setup/class_setupStep_Config3.inc

@@ -187,6 +187,7 @@ class Step_Config3 extends setup_step
     if ($cv['timezone']) {
       $attrs['fdTimezone'] = $cv['timezone'];
     }
+    $attrs['fdRfc2307bis']          = ($cv['rfc2307bis']?"TRUE":"FALSE");
     $attrs['fdPersonalTitleInDN']   = ($cv['include_personal_title']?"TRUE":"FALSE");
     if ($cv['base_hook_active']) {
       $attrs['fdNextIdHook'] = $cv['base_hook'];

setup/class_setupStep_Ldap.inc

@@ -38,8 +38,9 @@ class Step_Ldap extends setup_step
   var $resolve_user   = FALSE;
   var $tls            = FALSE;
 
+  var $rfc2307bis = FALSE;
   var $attributes = array("connection","location","admin","password","base","admin_given",
-                          "append_base_to_admin_dn","tls");
+                          "append_base_to_admin_dn","tls","rfc2307bis");
 
   var $header_image = 'geticon.php?context=places&icon=network-server&size=48';
 

setup/class_setupStep_Schema.inc

@@ -111,7 +111,8 @@ class Step_Schema extends setup_step
     $ldap             = new LDAP($cfg['admin'], $cfg['password'], $cfg['connection'], FALSE, $cfg['tls']);
     $objectclasses    = $ldap->get_objectclasses(TRUE);
     $this->found_ocs  = count($objectclasses);
-    $this->checked    = check_schema($cfg);
+    $rfc2307bis       = $cfg['rfc2307bis'];
+    $this->checked    = check_schema($cfg, $rfc2307bis);
 
     /* Which samba version do we use? */
     if (isset($objectclasses['sambaSamAccount'])) {

setup/setup_ldap.tpl

@@ -96,6 +96,20 @@
       <input type='password' name='password' value='{$password}'>
     </div>
   </div>
+
+  <p style="margin-top:20px">
+  <b>{t}Schema based settings{/t}</b>
+  </p>
+      <div class='step4_container'>
+    <div class='step4_name'>
+        {t}Use rfc2307bis compliant groups{/t}
+    </div>
+    <div class='step4_value'>
+        <select name="rfc2307bis" size="1" title="">
+        {html_options options=$bool selected=$rfc2307bis}
+        </select>
+    </div>
+      </div>
   {/if}
 
   {if ! $resolve_user}