Author: jsuchome Date: Fri Oct 31 15:22:48 2008 New Revision: 52801 URL: http://svn.opensuse.org/viewcvs/yast?rev=52801&view=rev Log: - delete crypted homes before writing /etc/passwd - check for cracklib-devel in configure - 2.17.21 Modified: trunk/users/VERSION trunk/users/configure.in.in trunk/users/package/yast2-users.changes trunk/users/src/Users.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=52801&r1=52800&r2=52801&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Oct 31 15:22:48 2008 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: trunk/users/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/configure.in.in?rev=52801&r1=52800&r2=52801&view=diff ============================================================================== --- trunk/users/configure.in.in (original) +++ trunk/users/configure.in.in Fri Oct 31 15:22:48 2008 @@ -11,5 +11,13 @@ @YAST2-CHECKS-TESTSUITE@ @YAST2-CHECKS-PROGRAM@ +AC_LANG_PUSH(C++) +yast_found_cracklib=no +AC_CHECK_HEADER(crack.h,[yast_found_cracklib=yes]) +if [[ "$yast_found_cracklib" = "no" ]]; then + AC_MSG_ERROR(Headers for cracklib are missing. Install the package cracklib-devel.) +fi +AC_LANG_POP(C++) + ## and generate the output... @YAST2-OUTPUT@ Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=52801&r1=52800&r2=52801&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Oct 31 15:22:48 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 15:09:40 CET 2008 - jsuchome@suse.cz + +- delete crypted homes before writing /etc/passwd +- check for cracklib-devel in configure +- 2.17.21 + +------------------------------------------------------------------- Wed Oct 29 09:08:54 CET 2008 - jsuchome@suse.cz - during live installation, available package is installed one Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=52801&r1=52800&r2=52801&view=diff ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Fri Oct 31 15:22:48 2008 @@ -4399,6 +4399,7 @@ # Write users if ($use_gui) { Progress->NextStage (); } + if ($users_modified) { if ($passwd_not_read) { # error popup (%s is a file name) @@ -4421,6 +4422,13 @@ $plugin_error = GetPluginError ($args, $result); } } + # remove the crypted directories now, so cryptconfig still knows them + if (!DeleteCryptedHomes ()) { + # error popup + $ret = __("An error occurred while removing users."); + Report->Error ($ret); + return $ret; + } # -------------------------------------- write /etc/passwd if ($plugin_error eq "" && !WritePasswd ()) { $ret = Message->ErrorWritingFile ("$base_directory/passwd"); @@ -4509,16 +4517,6 @@ Package->InstallAll (cryptconfig_packages ()); } - # remove the crypted directories now - if ($users_modified) { - if (!DeleteCryptedHomes ()) { - # error popup - $ret = __("An error occurred while removing users."); - Report->Error ($ret); - return $ret; - } - } - # Write passwords if ($use_gui) { Progress->NextStage (); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org