Attachment 220438 Details for Bug 391495

[patch] proposed patch

samba.diff (text/plain), 2.82 KB, created by Jiří Suchomel on 2008-06-05 12:49:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2008-06-05 12:49:09 UTC

Size: 2.82 KB

patch

obsolete

>Index: dialogs.ycp
>===================================================================
>--- dialogs.ycp	(revision 48076)
>+++ dialogs.ycp	(working copy)
>@@ -11,6 +11,7 @@
> textdomain "samba-client";
> 
> import "Autologin";
>+import "CWMFirewallInterfaces";
> import "Directory";
> import "Label";
> import "Message";
>@@ -217,14 +218,20 @@
>     // checkbox label
>     string text_fam	= _("Start File Alteration Monitor");
> 
>+    map<string,any> firewall_widget =
>+	CWMFirewallInterfaces::CreateOpenFirewallWidget ($[
>+	    "services"	: [ "samba-server" ],
>+	    "display_details" : true,
>+	]);
>+    term firewall_layout = firewall_widget["custom_widget"]:`VBox ();
>+
>     Wizard::SetContentsButtons( caption, `HVSquash( `VBox(
> 	// translators: frame label
> 	`Frame (_("Membership"),
> 	    `VBox (
> 		`HBox(
> 		    `HSpacing (0.2),
>-//		    `InputField (`id(`workgroup), `opt (`hstretch),
>-		    `TextEntry (`id(`workgroup), `opt (`hstretch),
>+		    `InputField (`id(`workgroup), `opt (`hstretch),
> 			(Stage::cont() ?
> 			_("&Domain") :
> 			// translators: text entry label
>@@ -262,7 +269,8 @@
> 	    "guest_access"	: guest
> 	]),
> 	autoyast_term,
>-	ntp_term
>+	ntp_term,
>+	firewall_layout
>     )),
> 	(Stage::cont() ? HELPS["MembershipDialog_cont"]:"" :
> 	    HELPS["MembershipDialog_nocont"]:"") +
>@@ -272,6 +280,7 @@
> 	    HELPS["MembershipDialog_NTP"]:""),
> 	Label::BackButton(), Stage::cont() ? Label::NextButton() : Label::FinishButton()
>     );
>+    CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, "");
>     foreach (symbol t, [`mkhomedir, `caching, `ssh], {
> 	UI::ChangeWidget (`id(t), `Enabled, Samba::GetWinbind() || Stage::cont());
>     });
>@@ -287,7 +296,10 @@
>     any ret = nil;
>     while(true) {
> 
>-	ret = UI::UserInput();
>+	map event	= UI::WaitForEvent ();
>+	ret		= (symbol) event["ID"]:nil;
>+	CWMFirewallInterfaces::OpenFirewallHandle(firewall_widget,"",event);
>+
> 	boolean use_winbind = Stage::cont() ? true :
> 	    (boolean)UI::QueryWidget(`id(`winbind), `Value);
> 
>@@ -475,6 +487,7 @@
> the machine to enable it for all services.
> "));
> 	    }
>+	    CWMFirewallInterfaces::OpenFirewallStore (firewall_widget,"",event);
> 	    break;
> 	} else if (ret == `back ) {
> 	    break;
>Index: Samba.ycp
>===================================================================
>--- Samba.ycp	(revision 48076)
>+++ Samba.ycp	(working copy)
>@@ -32,6 +32,7 @@
> import "SambaNmbLookup";
> import "String";
> import "Summary";
>+import "SuSEFirewall";
> 
> 
> /**
>@@ -553,6 +554,8 @@
>     NetworkConfig::Read ();
>     network_setup	= NetworkConfig::Export ();
> 
>+    SuSEFirewall::Read ();
>+
>     // finished
>     Progress::NextStage();
>     globals_configured = true;
>@@ -718,6 +721,11 @@
> 
>     WriteSSHSupport (ssh_support);
> 
>+    SuSEFirewall::WriteOnly ();
>+    if (!write_only)
>+	SuSEFirewall::ActivateConfiguration ();
>+
>+
>     // finished
>     Progress::NextStage();
>     modified = false;

Actions: View | Diff

Attachments on bug 391495: 216079 | 220438