Added krbsasl and fixed strict behavior

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 0231b466d5d150360bb138113cdcf9dd139ff659..3e911d393e6f999a1ec22c5935e242cb2aff9c2a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -329,6 +329,11 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
+{if $cv.krbsasl}
+                       krbsasl="true"
+{else}
+                       krbsasl="false"
+{/if}
 {if $cv.rfc2307bis}
                        rfc2307bis="true"
 {else}
@@ -352,9 +357,9 @@
                        idgen="{$cv.id_settings.idgen}"
 {/if}
 {if $cv.strict}
-                       strict="no"
-{else}
                        strict="yes"
+{else}
+                       strict="no"
 {/if}
 {if $cv.id_settings.minid_active}
                        minid="{$cv.id_settings.minid}"

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 5d4fbc3dc48b0ffdc532853b7e7cc6179099ee25..6a3ab619abb053ad61e43e5d868cff5347c60372 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -27,7 +27,7 @@ class Step_Config1 extends setup_step
   var $groupou    =  "ou=groups";
   var $peopledn   = "cn";
   var $uidbase    = 1000;
-
+  var $krbsasl    = FALSE;
   var $strict     = TRUE;
 
   var $header_image = "images/ldapserver.png";
@@ -56,7 +56,7 @@ class Step_Config1 extends setup_step
 
   var $crypt_methods  = array();
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","rfc2307bis",
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","rfc2307bis","krbsasl",
                           "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
   function Step_Config1()
@@ -90,6 +90,11 @@ class Step_Config1 extends setup_step
     foreach($this->attributes as $attr){
       $smarty->assign($attr,$this->$attr);
     }
+
+    /* !!! Attention strict is inverse. If you change this, 
+     *  don't forget to change save_object too 
+     */
+    $smarty->assign("strict",!$this->strict);
     return($smarty -> fetch (get_template_path("../setup/setup_config1.tpl")));
   }
 
@@ -146,6 +151,17 @@ class Step_Config1 extends setup_step
         }
       }
 
+      /* !!! Attention strict is inverse. If you change this, 
+       *  don't forget to change the smarty assignment too 
+       */
+      if(isset($_POST['strict'])){
+        if($_POST['strict']){
+          $this->strict = FALSE;
+        }else{
+          $this->strict = TRUE;
+        }
+      }
+
       if(isset($_POST['minid_active'])){
         $this->id_settings['minid_active'] = TRUE;
         if(isset($_POST['minid'])){

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index e26c89cd3127d8940817636f0d6878b091f560c5..0a117c7ac824ba8f27646e61f9f4c9bccc92faf3 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -201,6 +201,18 @@
             {/if}
         </div>
     </div>
+
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Use SASL for kerberos{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="krbsasl" size="1" title="">
+            {html_options options=$bool selected=$krbsasl}
+            </select>
+        </div>
+    </div>
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Use account expiration{/t}