setup update

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index d06411da38efa6a23e7b532085e0374742c4c1bc..422f88d40ed2b08ac202bd061e7e7b387487219f 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -132,8 +132,7 @@
        </ogrouptabs>
 
        <connectivity>
-               {kolabAccount}
-               <tab class="proxyAccount" />
+               {kolabAccount}<tab class="proxyAccount" />
                <tab class="pureftpdAccount" />
                <tab class="webdavAccount" />
                <tab class="phpgwAccount" />

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index a7ec36fc202f7dbb1c781cb3bd66887a87045ae7..a6fcdda866291dab0a5177740c98ff6a16f5e067 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -436,7 +436,8 @@ function parse_contrib_conf()
   elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1")))    {
     $pwdhash= "mkntpwd";
   } else {
-    $pwdhash=addslashes('  perl -MCrypt::SmbHash -e "ntlmgen \"\$ARGV[0]\", \$lm, \$nt; print \"\${lm}:\${nt}\n\";" $1');
+    
+    $pwdhash=('perl -MCrypt::SmbHash -e "ntlmgen \"\$ARGV[0]\", \$lm, \$nt; print \"\${lm}:\${nt}\n\";" $1');
     //    $pwdhash= 'perl -MCrypt::SmbHash -e \"ntlmgen \\"\\$ARGV[0]\\", \\$lm, \\$nt; print \\"\\${lm}:\\${nt}\\\";\"'; 
   }