From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 24 May 2005 11:15:43 +0000 (+0000)
Subject: setup update
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e85c74bbae889c104d40af087979f47adc85f219;p=gosa.git

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 d06411da3..422f88d40 100644
--- 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 a7ec36fc2..a6fcdda86 100644
--- 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}\\\";\"'; 
   }