Author: jsuchome Date: Fri Oct 19 11:13:53 2007 New Revision: 41474 URL: http://svn.opensuse.org/viewcvs/yast?rev=41474&view=rev Log: - check for empty lines in passwd/group/shadow (#333305) - 2.16.0 Modified: trunk/pam/VERSION trunk/pam/agent-passwd/ag_passwd trunk/pam/package/yast2-pam.changes Modified: trunk/pam/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/VERSION?rev=41474&r1=41473&r2=41474&view=diff ============================================================================== --- trunk/pam/VERSION (original) +++ trunk/pam/VERSION Fri Oct 19 11:13:53 2007 @@ -1 +1 @@ -2.14.0 +2.16.0 Modified: trunk/pam/agent-passwd/ag_passwd URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/agent-passwd/ag_passwd?rev=41474&r1=41473&r2=41474&view=diff ============================================================================== --- trunk/pam/agent-passwd/ag_passwd (original) +++ trunk/pam/agent-passwd/ag_passwd Fri Oct 19 11:13:53 2007 @@ -83,6 +83,11 @@ { 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); @@ -94,7 +99,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 9; @@ -148,6 +153,11 @@ foreach my $group (<GROUP>) { 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); @@ -250,6 +260,11 @@ foreach my $user (<PASSWD>) { 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); Modified: trunk/pam/package/yast2-pam.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pam/package/yast2-pam.changes?rev=41474&r1=41473&r2=41474&view=diff ============================================================================== --- trunk/pam/package/yast2-pam.changes (original) +++ trunk/pam/package/yast2-pam.changes Fri Oct 19 11:13:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 19 11:07:04 CEST 2007 - jsuchome@suse.cz + +- check for empty lines in passwd/group/shadow (#333305) +- 2.16.0 + +------------------------------------------------------------------- Thu Aug 24 14:52:31 CEST 2006 - jsuchome@suse.cz - adapted for pam-config usage (F300956) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org