Updated setup

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5713 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/setup/class_setupStep4.inc b/setup/class_setupStep4.inc
index b35d3a66b58ed32db63bb43bab14dfc88b4426e7..bac087915ed4bd8d0dbd9fb214ff54589e3f0b6d 100644 (file)
--- a/setup/class_setupStep4.inc
+++ b/setup/class_setupStep4.inc
@@ -111,8 +111,8 @@ class setup_step_4 extends setup_step
     @ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, 7);
     $cid = @ldap_connect($this->connection);
       
+    @ldap_set_option($cid, LDAP_OPT_PROTOCOL_VERSION, 3);
     $ds = @ldap_bind($cid, $this->admin, $this->password);
-    @ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
     
     if(!$ds){
       $str = sprintf(_("Anonymous bind failed on server '%s'."),$this->connection); 

diff --git a/setup/setup_step4.tpl b/setup/setup_step4.tpl
index 5b02f8ee3252e8288075b5d7e10c16648dce3bfb..92fb445dba6ed38d23a869a48a6e33e276ebedd9 100644 (file)
--- a/setup/setup_step4.tpl
+++ b/setup/setup_step4.tpl
@@ -34,7 +34,7 @@
                        {if $namingContextsCount >= 1}
 
                                <select name='base' style='width:100%;'>                
-                                       {html_options values=$namingContexts output=$namingContexts}
+                                       {html_options values=$namingContexts output=$namingContexts selected=$base}
                                </select>
                        {else}
                                <input type='text' name='base' maxlength='80' size='40' value='{$base}' style='width:100%;'>