Author: jsuchome Date: Thu Jun 7 10:50:30 2007 New Revision: 38332 URL: http://svn.opensuse.org/viewcvs/yast?rev=38332&view=rev Log: - do not offer disabling DHCP changes of hostname when it is already disabled (#169260) - 2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION?rev=38332&r1=38331&r2=38332&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION Thu Jun 7 10:50:30 2007 @@ -1 +1 @@ -2.13.37 +2.13.38 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes?rev=38332&r1=38331&r2=38332&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes Thu Jun 7 10:50:30 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jun 7 10:26:06 CEST 2007 - jsuchome@suse.cz + +- do not offer disabling DHCP changes of hostname when + it is already disabled (#169260) +- 2.13.38 + +------------------------------------------------------------------- Thu Jun 7 09:10:03 CEST 2007 - jsuchome@suse.cz - removed Browse button (#240045) Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp?rev=38332&r1=38331&r2=38332&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/Samba.ycp Thu Jun 7 10:50:30 2007 @@ -118,6 +118,9 @@ ], ]; +// network configuration (to be read from NetworkConfig module) +global map network_setup = $[]; + /** * Return list of architecture specific packages (derived from package list * given as parameter) merged with the packages in parameter @@ -454,6 +457,10 @@ Autologin::Read(); + // read network settings (for bug 169260: do not allow DHCP to change the hostname) + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + // finished Progress::NextStage(); globals_configured = true; @@ -513,11 +520,14 @@ // write progress step steps = add (steps, _("Writing Kerberos configuration...")); } - // hack for bug 169260: do not allow DHCP to change the hostname + // bug 169260: do not allow DHCP to change the hostname if (winbind_enabled && disable_dhcp_hostname) { - NetworkConfig::Read (); - map network_setup = NetworkConfig::Export (); + if (network_setup == $[]) + { + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + } network_setup["dhcp","DHCLIENT_SET_HOSTNAME"] = "no"; NetworkConfig::Import (network_setup); NetworkConfig::Write (); Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp?rev=38332&r1=38331&r2=38332&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Thu Jun 7 10:50:30 2007 @@ -378,7 +378,9 @@ Autologin::AskForDisabling(_("Samba is now enabled.")); } } - if (Mode::config () || (Stage::cont() && Samba::in_domain == `ok)) + if (Mode::config () || + (Stage::cont() && Samba::in_domain == `ok && + Samba::network_setup["dhcp","DHCLIENT_SET_HOSTNAME"]:"yes" == "yes")) { // yes/no popup text Samba::disable_dhcp_hostname = Popup::YesNo (_("In a Microsoft environment, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org