Fixed perl password generation line

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index 422f88d40ed2b08ac202bd061e7e7b387487219f..a028cbafc5803e099f67c87e4753d5f60645f7b6 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -154,7 +154,7 @@
                iconsize="48x48"
                pwminlen="6"
                forceglobals="false"
-               smbhash="{SMBHASH}">
+               smbhash='{SMBHASH}'>
 
                <location name="{LOCATIONNAME}"
                        uidbase="1000"

diff --git a/include/setup_checks.inc b/include/setup_checks.inc
index 35446c8ad3bb5e734534077be112541487fffb7e..124ec1e7856b4d00336bc21c84c9fcfecd1622a8 100644 (file)
--- a/include/setup_checks.inc
+++ b/include/setup_checks.inc
@@ -439,9 +439,7 @@ function parse_contrib_conf()
   elseif (preg_match("/^Usage: mkntpwd /", shell_exec ("mkntpwd 2>&1")))    {
     $pwdhash= "mkntpwd";
   } else {
-    
     $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}\\\";\"'; 
   }