Author: jsuchome Date: Tue May 20 09:20:48 2008 New Revision: 47690 URL: http://svn.opensuse.org/viewcvs/yast?rev=47690&view=rev Log: - do not enable configuration when pam_mount is set up (bnc#390810) - 2.16.8 Modified: trunk/fingerprint-reader/VERSION trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes trunk/fingerprint-reader/src/FingerprintReader.ycp Modified: trunk/fingerprint-reader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/VERSION?rev=47690&r1=47689&r2=47690&view=diff ============================================================================== --- trunk/fingerprint-reader/VERSION (original) +++ trunk/fingerprint-reader/VERSION Tue May 20 09:20:48 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes?rev=47690&r1=47689&r2=47690&view=diff ============================================================================== --- trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes (original) +++ trunk/fingerprint-reader/package/yast2-fingerprint-reader.changes Tue May 20 09:20:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 20 09:11:29 CEST 2008 - jsuchome@suse.cz + +- do not enable configuration when pam_mount is set up (bnc#390810) +- 2.16.8 + +------------------------------------------------------------------- Fri May 16 16:40:22 CEST 2008 - jsrain@suse.cz - added categories Settings and System into desktop file Modified: trunk/fingerprint-reader/src/FingerprintReader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/src/FingerprintReader.ycp?rev=47690&r1=47689&r2=47690&view=diff ============================================================================== --- trunk/fingerprint-reader/src/FingerprintReader.ycp (original) +++ trunk/fingerprint-reader/src/FingerprintReader.ycp Tue May 20 09:20:48 2008 @@ -96,6 +96,30 @@ } /** + * If pam_mount is enabled, pam_thinkfinger cannot be used (bnc#390810) + */ +global boolean CryptedHomesEnabled () { + + boolean enabled = false; + foreach (string service, ["gdm", "login", "kdm", "xdm", "sudo" ], { + map out = (map)SCR::Execute (.target.bash_output, sformat ( + "pam-config --service %1 -q --mount", service)); + if (out["exit"]:1 == 0) + { + list ll = filter (string l, splitstring(out["stdout"]:"", "\n"), { + return (l != ""); + }); + if (size (ll) > 0) + { + enabled = true; + break; + } + } + }); + return enabled; +} + +/** * Read all fingerprint-reader settings * @return true on success */ @@ -109,7 +133,12 @@ Report::Error (_("Fingerprint reader device is not available on this system.")); return false; } - + if (CryptedHomesEnabled ()) + { + // error popup (pam_thinkfinger cannot work with pam_mount) + Report::Error (_("Fingerprint reader device cannot be used when encrypted directories are used.")); + return false; + } use_pam = Pam::Enabled ("thinkfinger"); modified = false; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org