Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at Thu Apr 1 15:30:28 CEST 2010. -------- --- yast2-users/yast2-users.changes 2010-03-30 16:12:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2010-04-01 13:19:14.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 1 12:58:05 CEST 2010 - jsuchome@suse.cz + +- check user existence before adding to the group (bnc#592223) +- 2.19.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-users-2.19.9.tar.bz2 New: ---- yast2-users-2.19.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.AFoeP4/_old 2010-04-01 15:30:22.000000000 +0200 +++ /var/tmp/diff_new_pack.AFoeP4/_new 2010-04-01 15:30:22.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-users (Version 2.19.9) +# spec file for package yast2-users (Version 2.19.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,11 +19,11 @@ Name: yast2-users -Version: 2.19.9 +Version: 2.19.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-users-2.19.9.tar.bz2 +Source0: yast2-users-2.19.10.tar.bz2 Prefix: /usr @@ -50,7 +50,7 @@ This package provides GUI for maintenance of linux users and groups. %prep -%setup -n yast2-users-2.19.9 +%setup -n yast2-users-2.19.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-users-2.19.9.tar.bz2 -> yast2-users-2.19.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.19.9/VERSION new/yast2-users-2.19.10/VERSION --- old/yast2-users-2.19.9/VERSION 2010-03-30 16:11:52.000000000 +0200 +++ new/yast2-users-2.19.10/VERSION 2010-04-01 12:58:21.000000000 +0200 @@ -1 +1 @@ -2.19.9 +2.19.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.19.9/src/Users.pm new/yast2-users-2.19.10/src/Users.pm --- old/yast2-users-2.19.9/src/Users.pm 2010-03-30 16:12:00.000000000 +0200 +++ new/yast2-users-2.19.10/src/Users.pm 2010-03-31 16:29:14.000000000 +0200 @@ -5505,6 +5505,16 @@ $error = $self->CheckGroupname ($group{"cn"}); } + if ($error eq "") { + my %userlist = (); + if (defined $group{"userlist"}) { + %userlist = %{$group{"userlist"}}; + } + foreach my $user (keys %userlist) { + my %u = %{$self->GetUserByName ($user, "")}; + $error = sprintf (__("User %s does not exist."), $user) unless %u; + } + } my $error_map = UsersPlugins->Apply ("Check", { "what" => "group", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.19.9/testsuite/tests/YaPIGroupAdd.out new/yast2-users-2.19.10/testsuite/tests/YaPIGroupAdd.out --- old/yast2-users-2.19.9/testsuite/tests/YaPIGroupAdd.out 2010-03-08 11:55:33.000000000 +0100 +++ new/yast2-users-2.19.10/testsuite/tests/YaPIGroupAdd.out 2010-04-01 13:04:36.000000000 +0200 @@ -35,7 +35,7 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg2' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg2"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\nusers:x:100:\n+:::\n" true Execute .target.bash_output "diff -U 1 /etc/group.YaST2save /etc/group" $["stdout":"gg2"] Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true @@ -55,12 +55,27 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Execute .target.bash_output "echo 'gg3' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg3"] Execute .target.bash "/bin/cp /etc/group /etc/group.YaST2save" 0 -Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh1,hh2\ngg3:x:1002:hh1,hh2\nusers:x:100:\n+:::\n" true +Write .target.string "/etc/group" "audio:x:17:ii\nnobody:x:65533:\nroot:x:0:\ngg:x:1000:\ngg2:x:1001:hh\ngg3:x:1002:hh,ii\nusers:x:100:\n+:::\n" true Execute .target.bash_output "diff -U 1 /etc/group.YaST2save /etc/group" $["stdout":"gg3"] Execute .target.bash "/usr/sbin/nscd -i group" 0 Write .target.ycp "/var/lib/YaST2/users.ycp" $["custom_groups":["local"], "custom_users":["local"], "dont_warn_when_nisserver_notdes":false, "dont_warn_when_uppercase":false] true Return Dump ============ add new group 'gg3' - done ==================== +Dump ============ add new group 'gg4' with non existent user == +Read .etc.default.useradd."expire" 0 +Read .etc.default.useradd."group" 100 +Read .etc.default.useradd."groups" "audio,video" +Read .etc.default.useradd."home" "/tmp/local/home" +Read .etc.default.useradd."inactive" 0 +Read .etc.default.useradd."shell" 0 +Read .etc.default.useradd."skel" 0 +Read .target.string "/etc/shells" 0 +Read .etc.nsswitch_conf.passwd 0 +Read .etc.nsswitch_conf.passwd 0 +Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true +Execute .target.bash_output "echo 'gg4' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"gg4"] +Return User hh2 does not exist. +Dump ============ add new group 'gg4' - done ==================== Dump ============ add new group 'root' (groupname conflict): ====== Read .etc.default.useradd."expire" 0 Read .etc.default.useradd."group" 100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-users-2.19.9/testsuite/tests/YaPIGroupAdd.ycp new/yast2-users-2.19.10/testsuite/tests/YaPIGroupAdd.ycp --- old/yast2-users-2.19.9/testsuite/tests/YaPIGroupAdd.ycp 2010-03-08 11:55:33.000000000 +0100 +++ new/yast2-users-2.19.10/testsuite/tests/YaPIGroupAdd.ycp 2010-04-01 13:04:13.000000000 +0200 @@ -84,7 +84,7 @@ Testsuite::Dump ("============ add new group 'gg' - done ===================="); - data_map ["userlist"] = [ "hh1", "hh2" ]; + data_map ["userlist"] = [ "hh" ]; data_map ["cn"] = "gg2"; E ["target", "bash_output", "stdout"] = "gg2"; @@ -93,8 +93,8 @@ Testsuite::Dump ("============ add new group 'gg2' - done ===================="); data_map ["userlist"] = $[ - "hh1" : 1, - "hh2" : 1 + "hh" : 1, + "ii" : 1 ]; data_map ["cn"] = "gg3"; E ["target", "bash_output", "stdout"] = "gg3"; @@ -103,6 +103,16 @@ Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); Testsuite::Dump ("============ add new group 'gg3' - done ===================="); + data_map ["userlist"] = $[ + "hh2" : 1, + ]; + data_map ["cn"] = "gg4"; + E ["target", "bash_output", "stdout"] = "gg4"; + + Testsuite::Dump ("============ add new group 'gg4' with non existent user =="); + Testsuite::Test (``(YaPI::USERS::GroupAdd (config_map, data_map)), [R,W,E], 0); + Testsuite::Dump ("============ add new group 'gg4' - done ===================="); + Testsuite::Dump ("============ add new group 'root' (groupname conflict): ======"); data_map = $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org