Updated gosa.conf and class_config.

-Set sambaversion default to "3".

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

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index db4fc5e2577ad3d356d35645578917473e28cd9c..25f59f696a6d2b4d2996b7eb207c9c7365efbe9d 100644 (file)
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -596,6 +596,8 @@
 {/if}
 {if $cv.samba_version != 0}
               sambaversion="{$cv.samba_version}"
+{else}
+              sambaversion="3"
 {/if}
               config="ou=gosa,ou=configs,ou=systems,{$cv.base}">
 

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index 5f00a2bd0abea86c7649a256c091fa0719aa824c..ad109f53492a91a49ca0473ac76dd89612c6d9b6 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -287,6 +287,9 @@ class config  {
   {
     $this->current= $this->data['LOCATIONS'][$name];
 
+    if (!isset($this->current['SAMBAVERSION'])){
+      $this->current['SAMBAVERSION']= 3;
+    }
     if (!isset($this->current['PEOPLE'])){
       $this->current['PEOPLE']= "ou=people";
     }