Author: jsuchome Date: Fri Oct 19 11:06:46 2007 New Revision: 41468 URL: http://svn.opensuse.org/viewcvs/yast?rev=41468&view=rev Log: - check for empty lines in passwd/group/shadow (#333305) - 2.16.0 Modified: trunk/users/VERSION trunk/users/package/yast2-users.changes trunk/users/src/UsersPasswd.pm Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=41468&r1=41467&r2=41468&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Fri Oct 19 11:06:46 2007 @@ -1 +1 @@ -2.15.38 +2.16.0 Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=41468&r1=41467&r2=41468&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Fri Oct 19 11:06:46 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 10:53:46 CEST 2007 - jsuchome@suse.cz + +- check for empty lines in passwd/group/shadow (#333305) +- 2.16.0 + +------------------------------------------------------------------- Fri Sep 21 15:08:40 CEST 2007 - jsuchome@suse.cz - enable cryted directories for new users (#326794) Modified: trunk/users/src/UsersPasswd.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPasswd.pm?rev=41468&r1=41467&r2=41468&view=diff ============================================================================== --- trunk/users/src/UsersPasswd.pm (original) +++ trunk/users/src/UsersPasswd.pm Fri Oct 19 11:06:46 2007 @@ -116,7 +116,10 @@ foreach my $shadow_entry (split (/\n/,$in)) { chomp $shadow_entry; - + if ($shadow_entry eq "") { + y2warning ("empty line in shadow file..."); + next; + } my ($uname,$pass,$last_change,$min, $max, $warn, $inact, $expire, $flag) = split(/:/,$shadow_entry); my $first = substr ($uname, 0, 1); @@ -128,7 +131,7 @@ } elsif ($first ne "+" && $first ne "-") { - if ($uname eq "") { + if (!defined $uname || $uname eq "") { y2error ("strange line in shadow file: '$shadow_entry'"); $errno = 9; return 0; @@ -187,6 +190,10 @@ foreach my $group (split (/\n/,$in)) { chomp $group; + if ($group eq "") { + y2warning ("empty line in group file..."); + next; + } my ($groupname, $pass, $gid, $users) = split (/:/,$group); my $first = substr ($groupname, 0, 1); @@ -293,6 +300,11 @@ foreach my $user (split (/\n/,$in)) { chomp $user; + if ($user eq "") { + y2warning ("empty line in passwd file..."); + next; + } + my ($username, $password, $uid, $gid, $full, $home, $shell) = split(/:/,$user); my $first = substr ($username, 0, 1); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org