Author: jsuchome Date: Mon Sep 1 10:23:27 2008 New Revision: 50508 URL: http://svn.opensuse.org/viewcvs/yast?rev=50508&view=rev Log: - help text for directory encryption even if it is not available - 2.17.7 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/helps.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=50508&r1=50507&r2=50508&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Mon Sep 1 10:23:27 2008 @@ -1 +1 @@ -2.17.6 +2.17.7 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=50508&r1=50507&r2=50508&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Mon Sep 1 10:23:27 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 1 10:17:24 CEST 2008 - jsuchome@suse.cz + +- help text for directory encryption even if it is not available +- 2.17.7 + +------------------------------------------------------------------- Fri Aug 29 11:53:07 CEST 2008 - jsuchome@suse.cz - fixed capitalization of LDAP entries (bnc#420010) Modified: trunk/users/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/helps.ycp?rev=50508&r1=50507&r2=50508&view=diff ============================================================================== --- trunk/users/src/helps.ycp (original) +++ trunk/users/src/helps.ycp Mon Sep 1 10:23:27 2008 @@ -18,6 +18,7 @@ import "Users"; import "UsersCache"; import "UsersLDAP"; + import "UsersRoutines"; /** @@ -382,11 +383,6 @@ is created from the default skeleton (%1).</p> "), defaults["skel"]:""); - if ((user_type == "system" || user_type == "local") || - (user_type == "ldap" && Ldap::file_server)) - { - helptext = helptext + _("To encrypt the user's home directory, enable <b>Use Encrypted Home Directory</b> and set the directory size. Encrypting a user's home directory does not provide strong security from other users. If this machine is shared among multiple users, it may be possible for a user to compromise system security, obtain another user's key, and gain access to the encrypted data. If strong security is required, the system should not be physically shared."); - } } else { @@ -394,6 +390,21 @@ helptext = helptext + _("<p>If changing the location of a user's home directory, move the contents of the current directory with <b>Move to New Location</b>, activated by default. Otherwise a new home directory is created without any of the existing data.</p>"); } + if ((user_type == "system" || user_type == "local") || + (user_type == "ldap" && Ldap::file_server)) + { + if (UsersRoutines::CryptedHomesEnabled ()) + { + // help text for directory encryption + helptext = helptext + _("<p>To encrypt the user's home directory, enable <b>Use Encrypted Home Directory</b> and set the directory size. Encrypting a user's home directory does not provide strong security from other users. If this machine is shared among multiple users, it may be possible for a user to compromise system security, obtain another user's key, and gain access to the encrypted data. If strong security is required, the system should not be physically shared.</p>"); + } + else + { + // help text for directory encryption + helptext = helptext + _("<p>Home directories cannot be encrypted when fingerprint reader device is used. To encrypt the user's home directory, disable fingerprint configuration first.</p>"); + } + } + if (user_type == "ldap") helptext = helptext + // alternate helptext 5/8 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org