Author: jsuchome Date: Mon Jun 21 14:43:49 2010 New Revision: 62124 URL: http://svn.opensuse.org/viewcvs/yast?rev=62124&view=rev Log: - install needed packages before trying to join (bnc#610486) - 2.19.6 Modified: trunk/samba-client/VERSION trunk/samba-client/package/yast2-samba-client.changes trunk/samba-client/src/dialogs.ycp Modified: trunk/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/VERSION?rev=62124&r1=62123&r2=62124&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Mon Jun 21 14:43:49 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 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=62124&r1=62123&r2=62124&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Mon Jun 21 14:43:49 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 1 10:37:55 CEST 2010 - jsuchome@suse.cz + +- install needed packages before trying to join (bnc#610486) +- 2.19.6 + +------------------------------------------------------------------- Thu Apr 1 13:08:17 CEST 2010 - jsuchome@suse.cz - allow editing Machine Account OU in autoYaST config (bnc#581347) Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=62124&r1=62123&r2=62124&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Mon Jun 21 14:43:49 2010 @@ -546,6 +546,26 @@ Samba::SetWinbind (use_winbind); + if (use_winbind) + { + list<string> packages = ["samba-winbind"]; + if (SambaAD::ADS () != "") + { + packages = (list<string>)merge(packages,["krb5","krb5-client"]); + } + if (Samba::PAMMountModified () && size (Samba::GetPAMMountVolumes ()) > 0) + { + packages = add (packages, "pam_mount"); + } + if (!Package::InstallAll (packages)) + { + Popup::Error (Message::FailedToInstallPackages ()); + ret = `not_next; + UI::ChangeWidget(`id(`winbind), `Value, false); + continue; + } + } + // for domain ask to join symbol workgroup_type = CheckWorkgroup(workgroup); @@ -626,25 +646,6 @@ Disable hostname changes with DHCP?")); } - if (use_winbind) - { - list<string> packages = ["samba-winbind"]; - if (SambaAD::ADS () != "") - { - packages = (list<string>)merge(packages,["krb5","krb5-client"]); - } - if (Samba::PAMMountModified () && size (Samba::GetPAMMountVolumes ()) > 0) - { - packages = add (packages, "pam_mount"); - } - if (!Package::InstallAll (packages)) - { - Popup::Error (Message::FailedToInstallPackages ()); - ret = `not_next; - UI::ChangeWidget(`id(`winbind), `Value, false); - continue; - } - } Samba::SetMkHomeDir (use_winbind && (boolean)UI::QueryWidget(`id(`mkhomedir), `Value)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org