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 f37487270a949f832f0cfb855247bafd86e01524..34e94316a8483c890e29ea8e978962b3c50c632a 100644 (file)
--- 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 270f1e2565c7f5484e10308ce47d45a1a1805a40..d783fc41cc4baee05cc7564e69629f3061f3bf3a 100644 (file)
--- 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";
     }