From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 1 Sep 2008 09:41:51 +0000 (+0000)
Subject: Updated config and gosa.conf
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e20e320100091b4c07f9eeb68563e51c165d616b;p=gosa.git

Updated config and gosa.conf
-Added default samba version, value is 3


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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index f37487270..34e94316a 100644
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -533,6 +533,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/include/class_config.inc b/include/class_config.inc
index 270f1e256..d783fc41c 100644
--- a/include/class_config.inc
+++ b/include/class_config.inc
@@ -231,6 +231,9 @@ class config  {
     if (!isset($this->current['PEOPLE'])){
       $this->current['PEOPLE']= "ou=people";
     }
+    if (!isset($this->current['SAMBAVERSION'])){
+      $this->current['SAMBAVERSION']= 3;
+    }
     if (!isset($this->current['GROUPS'])){
       $this->current['GROUPS']= "ou=groups";
     }