Updated gofon macro parsing

[gosa.git] / contrib / gosa.conf

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 33212f59a1eb9ddebb80b923fd90a19a261a728c..34e94316a8483c890e29ea8e978962b3c50c632a 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -290,11 +290,13 @@
                <tab class="webdavAccount" />
                <tab class="phpgwAccount" />
                <tab class="intranetAccount" />
+<!--
                <tab class="opengwAccount"
                        username="OGo"
                        password=""
                        database="OGo"
                        datahost="localhost" />
+-->
 <!--   
                <tab class="pptpAccount" /> 
                <tab class="phpscheduleitAccount" /> 
@@ -452,10 +454,10 @@
                        groups="{$cv.groupou}"
                        gidbase="{$cv.uidbase}"
                        uidbase="{$cv.uidbase}"
-{if $cv.optional.login_attribute}
-                       login_attribute="{$cv.optional.login_attribute}"
+{if $cv.optional.auth_mail}
+                       auth_mail="true"
 {else}
-                       login_attribute="uid"
+                       auth_mail="false"
 {/if}
 {if $cv.optional.strict_units}
                        strict_units="true"
@@ -504,6 +506,7 @@
 {else}
                        cyrusunixstyle="false"
 {/if}
+                       mail_uattrib="{$cv.mail_attrib}"
 {if $cv.mail_settings.vacationdir_active}
                        vacationdir="{$cv.mail_settings.vacationdir}"
 {/if}
@@ -530,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}">