Author: jsuchome Date: Fri Jul 20 07:46:37 2007 New Revision: 39556 URL: http://svn.opensuse.org/viewcvs/yast?rev=39556&view=rev Log: - do not offer disabling DHCP changes of hostname when it is already disabled (#292996) - 2.15.10 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/Samba.ycp trunk/samba-client/src/dialogs.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=39556&r1=39555&r2=39556&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Fri Jul 20 07:46:37 2007 @@ -1 +1 @@ -2.15.9 +2.15.10 Modified: trunk/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/package/yast2-samba-client.changes?rev=39556&r1=39555&r2=39556&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Fri Jul 20 07:46:37 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 19 11:37:36 CEST 2007 - jsuchome@suse.cz + +- do not offer disabling DHCP changes of hostname when + it is already disabled (#292996) +- 2.15.10 + +------------------------------------------------------------------- Tue Jun 19 09:25:31 CEST 2007 - jsuchome@suse.cz - added support for Smart Card (F302132): pkinit section in krb.conf Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=39556&r1=39555&r2=39556&view=diff ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Fri Jul 20 07:46:37 2007 @@ -121,6 +121,9 @@ ], ]; +// network configuration (to be read from NetworkConfig module) +global map network_setup = NetworkConfig::Export (); + /** * Return list of architecture specific packages (derived from package list * given as parameter) merged with the packages in parameter @@ -447,6 +450,11 @@ 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; @@ -505,12 +513,15 @@ 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 (); - network_setup["dhcp","DHCLIENT_SET_HOSTNAME"] = "no"; + if (network_setup == $[]) + { + NetworkConfig::Read (); + network_setup = NetworkConfig::Export (); + } + network_setup["dhcp","DHCLIENT_SET_HOSTNAME"] = "no"; NetworkConfig::Import (network_setup); NetworkConfig::Write (); } Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=39556&r1=39555&r2=39556&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Fri Jul 20 07:46:37 2007 @@ -384,7 +384,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