added homes

1 files changed, 36 insertions, 17 deletions

diff --git a/samba_wizard/samba.wiz b/samba_wizard/samba.wiz
index f490b5dc..4de65ece 100644
--- a/samba_wizard/samba.wiz
+++ b/samba_wizard/samba.wiz
@@ -24,7 +24,12 @@
 		shellVariable="wiz_do_printer_sharing"
 	>
 	</Variable>
-
+	<Variable
+		name="doHomes"
+		comment="true if samba do printer sharing"
+		shellVariable="wiz_do_homes"
+	>
+	</Variable>
 	<Variable
 		name="workgroup"
 		comment="The workgroup name"
@@ -87,7 +92,7 @@
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_services"
-		jumpScript="__WIZ_HOME__/samba_wizard/scripts/check_services.sh"
+		func="check_services"
 		executionLevel="NORMAL"
 		nextFinish="false"
 		canBack="true"
@@ -95,14 +100,14 @@
 	>
 
 		<Target
-			targetName="error_in_services"
-			jumpIndex="1"
+			targetName="warn_smbpasswd"
+			jumpIndex="2"
 		>
 		</Target>
 
 		<Target
 			targetName="ask_workgroup"
-			jumpIndex="10"
+			jumpIndex="0"
 		>
 		</Target>
 
@@ -123,7 +128,7 @@
 			variableName="doFileSharing"
 			forceEnabled="true"
 			forceDisabled="false"
-			helpText="Enable Common File Sharing Area"
+			helpText="Enable /home/samba/public Sharing Area"
 		>
 		</Boolean>
 
@@ -135,31 +140,37 @@
 			helpText="Enable Server Printer Sharing"
 		>
 		</Boolean>
+		<Boolean
+			name="homesSharingBoolean"
+			variableName="doHomes"
+			forceEnabled="true"
+			forceDisabled="false"
+			helpText="Make homes directory availables for
+			theirs owners"
+		>
+		</Boolean>
+
 	</Page>
 
+
 	<Page
-		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
-		name="error_in_services"
-		comment="Error message for an incorrect hostname"
-		jumpPage="ask_hostname"
+		name="warn_smbpasswd"
+		comment="Warning"
+		jumpPage="ask_workgroup"
 		nextButtonText="OK"
 		executionLevel="NORMAL"
-		nextFinish="true"
+		nextFinish="false"
 		canBack="true"
 		canCancel="true"
 	>
 
 		<Info
-			helpText="No Samba service has been requested"
-		>
-		</Info>
-
-		<Info
-			helpText="Press Quit to exit or Back to correct your choice"
+			helpText="You have selected to allow user access theirs home directories via samba but you/they must use smbpasswd to set a password."
 		>
 		</Info>
 	</Page>
 
+
 	<Page
 		helpURL="file:/usr/share/doc/mandrake/${LANG}/ref.html/wiz-samba.html"
 		name="ask_workgroup"
@@ -332,6 +343,14 @@ needed to configure Samba."
 		</Freetext>
 
 		<Freetext
+			name="freetext2"
+			variableName="doHomes"
+			helpText="Home :"
+			editable="false"
+		>
+		</Freetext>
+
+		<Freetext
 			name="freetext3"
 			variableName="workgroup"
 			helpText="Workgroup:"