Author: jsuchome Date: Thu Nov 19 09:44:04 2009 New Revision: 59604 URL: http://svn.opensuse.org/viewcvs/yast?rev=59604&view=rev Log: - install pam_mount if necessary (bnc#552211) - 2.19.0 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=59604&r1=59603&r2=59604&view=diff ============================================================================== --- trunk/samba-client/VERSION (original) +++ trunk/samba-client/VERSION Thu Nov 19 09:44:04 2009 @@ -1 +1 @@ -2.18.3 +2.19.0 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=59604&r1=59603&r2=59604&view=diff ============================================================================== --- trunk/samba-client/package/yast2-samba-client.changes (original) +++ trunk/samba-client/package/yast2-samba-client.changes Thu Nov 19 09:44:04 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Nov 19 09:43:02 CET 2009 - jsuchome@suse.cz + +- install pam_mount if necessary (bnc#552211) +- 2.19.0 + +------------------------------------------------------------------- Thu Sep 3 14:39:16 CEST 2009 - jsuchome@suse.cz - added keywords to desktop file Modified: trunk/samba-client/src/Samba.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/Samba.ycp?rev=59604&r1=59603&r2=59604&view=diff ============================================================================== --- trunk/samba-client/src/Samba.ycp (original) +++ trunk/samba-client/src/Samba.ycp Thu Nov 19 09:44:04 2009 @@ -135,7 +135,7 @@ // network configuration (to be read from NetworkConfig module) global map network_setup = NetworkConfig::Export (); -boolean PAMMountModified () { +global boolean PAMMountModified () { return (pam_mount_volumes_orig == nil && pam_mount_volumes != []) @@ -1090,7 +1090,7 @@ * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ - list<string> to_install = ["samba-client", "samba-winbind"]; + list<string> to_install = ["samba-client", "samba-winbind", "pam_mount"]; if (SambaAD::ADS () != "") to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]); return $[ Modified: trunk/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/samba-client/src/dialogs.ycp?rev=59604&r1=59603&r2=59604&view=diff ============================================================================== --- trunk/samba-client/src/dialogs.ycp (original) +++ trunk/samba-client/src/dialogs.ycp Thu Nov 19 09:44:04 2009 @@ -629,6 +629,10 @@ { 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 ()); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org