dhcp fix and script improvements and little fixes

6 files changed, 28 insertions, 8 deletions

diff --git a/drakwizard.pl b/drakwizard.pl
index e88e40cf..c3143897 100755
--- a/drakwizard.pl
+++ b/drakwizard.pl
@@ -231,7 +231,6 @@ sub display {
 		  : { label => $_->{helpText}, val => \$ENV{$variable{$_->{variableName}}},
 			list => [@liste], type => $_->{main_order} };
 	} @{$page->{freetext}};
-
 	if($page->{executionLevel} eq 'NORMAL') {
 	    $in->ask_from(translate($page->{name}), translate($page->{info}), 
 			  \@data) or navigation($o, $page->{old_page});
diff --git a/ftp_wizard/scripts/Ftpconf.pm b/ftp_wizard/scripts/Ftpconf.pm
index a2c57f04..92473579 100644
--- a/ftp_wizard/scripts/Ftpconf.pm
+++ b/ftp_wizard/scripts/Ftpconf.pm
@@ -1,5 +1,23 @@
 #!/usr/bin/perl
 
+# Proftpd Config Parser
+
+# Copyright (C) 2002 MandrakeSoft Arnaud Desmons <adesmons@mandrakesoft.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
 package Ftpconf;
 require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 use MDK::Common;
diff --git a/ftp_wizard/scripts/ProFtpconf.pm b/ftp_wizard/scripts/ProFtpconf.pm
index ec596a88..a53a1023 100644
--- a/ftp_wizard/scripts/ProFtpconf.pm
+++ b/ftp_wizard/scripts/ProFtpconf.pm
@@ -15,7 +15,6 @@ sub	true {
     0;
 }
 
-
 my $o = DrakconnectConf->new();
 
 sub	check {
@@ -73,7 +72,7 @@ sub	do_it {
 <Global>
   <Limit LOGIN>
     Order allow,deny
-    Allow from ' .$allow.'
+    Allow from '.$allow.'
     Deny from all
   </Limit>
 </Global>';
diff --git a/proxy_wizard/scripts/Squidconf.pm b/proxy_wizard/scripts/Squidconf.pm
index fa99558d..4437e355 100644
--- a/proxy_wizard/scripts/Squidconf.pm
+++ b/proxy_wizard/scripts/Squidconf.pm
@@ -5,6 +5,7 @@ require "__WIZ_HOME__/common/scripts/Vareqval.pm";
 require "__WIZ_HOME__/common/scripts/Varspaceval.pm";
 use MDK::Common;
 use strict;
+use standalone;
 
 sub	do_it_squid {
     my $file="/etc/squid/squid.conf";
@@ -17,6 +18,9 @@ sub	do_it_squid {
 	s|^\s*\#?\s*(cache_mem\s*)\d*(\s*MB.*)|$1$ENV{wiz_squid_mem}$2|;
 	s|^\s*\#?\s*(http_port\s*)\d*(.*)|$1$ENV{wiz_squid_port}$2|;
     } $file;
+    standalone::explanations("$file: cache_dir = $ENV{wiz_squid_defdir} $ENV{wiz_squid_disk} 
+mynetw = $ENV{wiz_squid_mynetw} cache_mem = $ENV{wiz_squid_mem} http_port = $ENV{wiz_squid_port} 
+level = $ENV{wiz_squid_level}");
     if ($ENV{wiz_squid_level} == 1) {
 	substInFile {
 	    s|^\s*\#?\s*(http_access\s*)deny(\s*all.*)|\#$&$1allow$2|;
diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index efb6089d..2f9eb99d 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -108,7 +108,7 @@
 			variableName="doFileSharing"
 			forceEnabled="true"
 			forceDisabled="false"
-			helpText="Enable /home/samba/public Sharing Area"
+			helpText="Enable /home/samba/public sharing area"
 		>
 		</Boolean>
 
diff --git a/samba_wizard/scripts/smb.conf.default b/samba_wizard/scripts/smb.conf.default
index 538e875e..c1ac473e 100644
--- a/samba_wizard/scripts/smb.conf.default
+++ b/samba_wizard/scripts/smb.conf.default
@@ -99,10 +99,10 @@
 # NOTE2: You do NOT need these to allow workstations to change only
 #        the encrypted SMB passwords. They allow the Unix password
 #        to be kept in sync with the SMB password.
-;  unix password sync = Yes
-;  passwd program = /usr/bin/passwd %u
-;  passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n
-;*passwd:*all*authentication*tokens*updated*successfully*
+  unix password sync = Yes
+  passwd program = /usr/bin/passwd %u
+  passwd chat = *New*UNIX*password* %n\n *ReType*new*UNIX*password* %n\n
+*passwd:*all*authentication*tokens*updated*successfully*
 
 # Unix users can map to different SMB User names
 ;  username map = /etc/samba/smbusers