Author: locilka Date: Fri Sep 5 16:17:08 2008 New Revision: 50759 URL: http://svn.opensuse.org/viewcvs/yast?rev=50759&view=rev Log: - Added WINS Hostname Resolution support (FATE #300971). - 2.17.2 Modified: trunk/samba-server/VERSION trunk/samba-server/package/yast2-samba-server.changes trunk/samba-server/src/SambaServer.pm trunk/samba-server/src/dialogs.ycp trunk/samba-server/yast2-samba-server.spec.in Modified: trunk/samba-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/VERSION?rev=50759&r1=50758&r2=50759&view=diff ============================================================================== --- trunk/samba-server/VERSION (original) +++ trunk/samba-server/VERSION Fri Sep 5 16:17:08 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/samba-server/package/yast2-samba-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/package/yast2-samba-server.changes?rev=50759&r1=50758&r2=50759&view=diff ============================================================================== --- trunk/samba-server/package/yast2-samba-server.changes (original) +++ trunk/samba-server/package/yast2-samba-server.changes Fri Sep 5 16:17:08 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Sep 5 16:15:54 CEST 2008 - locilka@suse.cz + +- Added WINS Hostname Resolution support (FATE #300971). +- 2.17.2 + +------------------------------------------------------------------- Thu Sep 4 15:34:33 CEST 2008 - locilka@suse.cz - Adapted to yast2-ldap API changes (patch created by rhafer) Modified: trunk/samba-server/src/SambaServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/SambaServer.pm?rev=50759&r1=50758&r2=50759&view=diff ============================================================================== --- trunk/samba-server/src/SambaServer.pm (original) +++ trunk/samba-server/src/SambaServer.pm Fri Sep 5 16:17:08 2008 @@ -249,6 +249,9 @@ # PackageSystem->CheckAndInstallPackagesInteractive(["samba-pdb"]) or return 0; # } + y2milestone ("Writing WINS Host Resolution=", Samba->GetHostsResolution()); + Samba->WriteHostsResolution(); + if (!SambaConfig->Write($write_only)) { # /etc/samba/smb.conf is filename Report->Error(__("Cannot write settings to /etc/samba/smb.conf.")); Modified: trunk/samba-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/src/dialogs.ycp?rev=50759&r1=50758&r2=50759&view=diff ============================================================================== --- trunk/samba-server/src/dialogs.ycp (original) +++ trunk/samba-server/src/dialogs.ycp Fri Sep 5 16:17:08 2008 @@ -70,7 +70,10 @@ boolean confirmAbort() { y2warning("confirm abort"); - return !SambaServer::GetModified() || Popup::ReallyAbort(true); + if (! SambaServer::GetModified()) + return true; + + return Popup::ReallyAbort (true); } @@ -93,7 +96,7 @@ // `ComboBox ( `id( "workgroups" ), `opt( `editable ), _("&Workgroup or Domain Name"), workgroups ) // TRANSLATORS: text entry - `TextEntry (`id ("workgroups"), _("&Workgroup or Domain Name"), workgroup) + `InputField (`id ("workgroups"), `opt (`hstretch), _("&Workgroup or Domain Name"), workgroup) ) ), `VStretch () @@ -228,6 +231,10 @@ UI::ChangeWidget(`id(`dhcp), `Value, Samba::GetDHCP()); } +void WinsHostResolutionWidgetInit (string key) { + UI::ChangeWidget(`id(`wins_dns), `Value, Samba::GetHostsResolution()); +} + void GlobalConfigStringWidgetInit(string key) { UI::ChangeWidget(`id(key), `Value, SambaConfig::GlobalGetStr(key, "")); @@ -278,6 +285,15 @@ } } +void WinsHostResolutionWidgetStore (string key, map event_descr) { + boolean new_value = (boolean) UI::QueryWidget(`id (`wins_dns), `Value); + if (new_value != nil) { + y2milestone ("Setting WINS Host Resolution '%1' returned '%2'", + new_value, Samba::SetHostsResolution (new_value) + ); + } +} + void GlobalConfigStringWidgetStore(string key, map event_descr) { string value = (string)UI::QueryWidget(`id(key), `Value); @@ -382,13 +398,13 @@ 35, `VBox ( // TRANSLATORS: text entry - `TextEntry (`id ("share_name"), `opt(`hstretch), _("New Share &Name"), share) + `InputField (`id ("share_name"), `opt(`hstretch), _("New Share &Name"), share) ) )), `VSpacing (1), - `HBox ( - `PushButton (`id (`ok), Label::OKButton()), - `PushButton (`id (`cancel), Label::CancelButton()) + `ButtonBox ( + `PushButton (`id (`ok), `opt (`okButton), Label::OKButton()), + `PushButton (`id (`cancel), `opt (`cancelButton), Label::CancelButton()) ) ); @@ -516,12 +532,12 @@ { //rwalter I couldn't make this one show up. Please make sure my deletions didn't make it too confusing. term contents = `VBox ( - `TextEntry (`id(`domain), _("Trusted &Domain") ), + `InputField (`id(`domain), `opt (`hstretch), _("Trusted &Domain")), `Password (`id(`password), _("&Password") ), `VSpacing (1), `HBox ( - `PushButton (`id (`ok), `opt (`default), Label::OKButton () ), - `PushButton (`id (`cancel), Label::CancelButton () ) + `PushButton (`id (`ok), `opt (`default), Label::OKButton ()), + `PushButton (`id (`cancel), Label::CancelButton ()) ) ); @@ -671,8 +687,8 @@ `VBox(`opt(`hstretch), `VSpacing(1), `Frame(_("Identification"), `VBox( - `TextEntry(`id(`name), _("Share &Name")), - `TextEntry(`id(`comment), _("Share &Description")))), + `InputField (`id(`name), `opt (`hstretch), _("Share &Name")), + `InputField (`id(`comment), `opt (`hstretch), _("Share &Description")))), `Frame(_("Share Type"), `HBox( `HSpacing ( 1 ), `VBox(`opt(`hstretch ), @@ -825,9 +841,11 @@ `HSpacing(1) ); - // TRANSLATORS: check box term wins_via_dhcp = DHCPSupportTerm (Samba::GetDHCP()); + // TRANSLATORS: check box + term wins_host_resolution = `Left (`CheckBox (`id (`wins_dns), _("Use WINS for Hostname Resolution"))); + list<term> roles = [ // translators: combobox item `item(`id("STANDALONE"), _("Not a DC")), @@ -845,7 +863,7 @@ `VBox( // `ComboBox(`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name"), // SambaNmbLookup::GetAvailableNeighbours(nil)), - `TextEntry (`id("workgroup_domainname"), `opt(`editable, `hstretch), _("&Workgroup or Domain Name")), + `InputField (`id("workgroup_domainname"), `opt(`hstretch), _("&Workgroup or Domain Name")), // translators: combobox label `ComboBox(`id("domain_controller"), `opt(`hstretch), _("Domain &Controller"), roles), `VStretch() @@ -920,6 +938,7 @@ `VSpacing (1), "netbios name", "WINS via DHCP", + "WINS Host Resolution", "ADVANCED SETTINGS" ) ), @@ -940,6 +959,7 @@ `Frame (_("WINS"), `VBox ( "WINS SETTINGS", `HBox (`HSpacing (1), "WINS via DHCP"), + `HBox (`HSpacing (1), "WINS Host Resolution"), `VStretch() )) ) @@ -959,7 +979,7 @@ ), `HWeight(1, `Empty()) ), - "widget_names": ["IDENTITY COMMON HELP", "BASE SETTINGS", "WINS SETTINGS", "WINS via DHCP", "netbios name", "ADVANCED SETTINGS"] + "widget_names": ["IDENTITY COMMON HELP", "BASE SETTINGS", "WINS SETTINGS", "WINS via DHCP", "WINS Host Resolution", "netbios name", "ADVANCED SETTINGS"] ] ]; @@ -1010,7 +1030,7 @@ "WINS SETTINGS": $[ "widget" : `custom, "custom_widget" : wins_widget, - "help": HELPS["smb_conf_tab_wins_settings"]:"", + "help": HostsResolutionHelp(), "init": WinsSettingsWidgetInit, "store": WinsSettingsWidgetStore, "handle": WinsSettingsWidgetHandle, @@ -1022,6 +1042,13 @@ "init": WinsViaDHCPWidgetInit, "store": WinsViaDHCPWidgetStore, ], + "WINS Host Resolution" : $[ + "widget" : `custom, + "custom_widget" : wins_host_resolution, + "help" : HELPS["smb_conf_tab_wins_host_resolution"]:"", + "init": WinsHostResolutionWidgetInit, + "store": WinsHostResolutionWidgetStore, + ], "netbios name": $[ "widget": `textentry, "label": _("NetBIOS &Hostname"), Modified: trunk/samba-server/yast2-samba-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-server/yast2-samba-server.spec.in?rev=50759&r1=50758&r2=50759&view=diff ============================================================================== --- trunk/samba-server/yast2-samba-server.spec.in (original) +++ trunk/samba-server/yast2-samba-server.spec.in Fri Sep 5 16:17:08 2008 @@ -9,8 +9,8 @@ Requires: yast2-ldap-client Requires: yast2-perl-bindings Requires: yast2-network -# SambaNetJoin::Join -Requires: yast2-samba-client >= 2.16.5 +# Samba::Wins~Name~Resolution +Requires: yast2-samba-client >= 2.17.1 Requires: yast2-users # bnc #386473, recommend yast2-samba-server when installaing these packages -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org