Author: jsuchome Date: Mon Jul 21 16:10:36 2008 New Revision: 49295 URL: http://svn.opensuse.org/viewcvs/yast?rev=49295&view=rev Log: - do not lowecase LDAP object names (fate#303596): internal user/group keys (not only LDAP) adapted to new schema - 2.17.2 Modified: trunk/users/VERSION trunk/users/doc/users.html trunk/users/package/yast2-users.changes trunk/users/src/Users.pm trunk/users/src/UsersCache.pm trunk/users/src/UsersLDAP.pm trunk/users/src/UsersPasswd.pm trunk/users/src/UsersPluginLDAPAll.pm trunk/users/src/UsersPluginLDAPPasswordPolicy.pm trunk/users/src/UsersPluginLDAPShadowAccount.pm trunk/users/src/UsersRoutines.pm trunk/users/src/UsersSimple.pm trunk/users/src/YaPI/USERS.pm trunk/users/src/cmdline.ycp trunk/users/src/dialogs.ycp trunk/users/src/inst_root.ycp trunk/users/src/inst_root_first.ycp trunk/users/src/inst_user.ycp trunk/users/src/inst_user_first.ycp trunk/users/src/users_auto.ycp trunk/users/src/users_plugin_ldap_all.ycp trunk/users/src/users_plugin_ldap_shadowaccount.ycp trunk/users/src/widgets.ycp trunk/users/testsuite/tests/AddGroup.out trunk/users/testsuite/tests/AddGroup.ycp trunk/users/testsuite/tests/AddUser.out trunk/users/testsuite/tests/AddUser.ycp trunk/users/testsuite/tests/BuildAdditional.out trunk/users/testsuite/tests/CheckPassword.ycp trunk/users/testsuite/tests/ConvertMap.out trunk/users/testsuite/tests/ConvertMap.ycp trunk/users/testsuite/tests/DeleteUser.out trunk/users/testsuite/tests/EditUser.out trunk/users/testsuite/tests/EditUser.ycp trunk/users/testsuite/tests/EditUsersGroups.out trunk/users/testsuite/tests/EditUsersGroups.ycp trunk/users/testsuite/tests/Import.out trunk/users/testsuite/tests/ImportExportUser.out trunk/users/testsuite/tests/Read.out trunk/users/testsuite/tests/SelectUser.out trunk/users/testsuite/tests/SubstituteValues.out trunk/users/testsuite/tests/SubstituteValues.ycp Modified: trunk/users/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/VERSION (original) +++ trunk/users/VERSION Mon Jul 21 16:10:36 2008 @@ -1 +1 @@ -2.17.1 +2.17.2 Modified: trunk/users/doc/users.html URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/doc/users.html?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/doc/users.html (original) +++ trunk/users/doc/users.html Mon Jul 21 16:10:36 2008 @@ -97,11 +97,11 @@ 500: $[ "cn" :"Ha Ha Herman", "uid" :"hh", - "uidnumber" :500, - "gidnumber" :100, - "homedirectory" :"/home/hh", - "userpassword" :"x", - "loginshell" :"/bin/bash", + "uidNumber" :500, + "gidNumber" :100, + "homeDirectory" :"/home/hh", + "userPassword" :"x", + "loginShell" :"/bin/bash", "type" : "local", "grouplist" : $[ "audio" : 1, @@ -114,22 +114,22 @@ "ldap": $[ 5000: $[ "cn" :"LDAP user", - "givenname" : "LDAP", + "givenName" : "LDAP", "sn" : "user", "dn" : "uid=ldap1,ou=people,dc=suse,dc=cz", "uid" : "ldap1", - "uidnumber" : 5000, - "gidnumber" : 100, - "homedirectory" : "/ldap_homes/ldap1", - "userpassword" : "x", - "loginshell" : "/bin/bash", + "uidNumber" : 5000, + "gidNumber" : 100, + "homeDirectory" : "/ldap_homes/ldap1", + "userPassword" : "x", + "loginShell" : "/bin/bash", - "shadowexpire" : "0", - "shadowinact" : "-1", - "shadowlastchange" : "11984", - "shadowmax" : "99999", - "shadowmin" : "0", - "shadowwarn" : "7", + "shadowExpire" : "0", + "shadowInactive" : "-1", + "shadowLastChange" : "11984", + "shadowMax" : "99999", + "shadowMin" : "0", + "shadowWarning" : "7", "type" : "ldap", "grouplist" : $[ @@ -219,7 +219,7 @@ these which were read from the config file (/etc/passwd) or other user repository (LDAP directory) and will be written - there at the end, like "gidnumber", "uidnumber", or "username". + there at the end, like "gidNumber", "uidNumber", or "username". <li>helper structures <p> @@ -233,21 +233,21 @@ <pre> $[ "cn" : "LDAP user", - "givenname" : "LDAP", + "givenName" : "LDAP", "sn" : "user", "dn" : "uid=ldap1,ou=people,dc=suse,dc=cz", "uid" : "ldap1", - "uidnumber" : 5000, - "gidnumber" : 100, - "homedirectory" : "/ldap_homes/ldap1", - "userpassword" : "x", - "loginshell" : "/bin/bash", - "shadowexpire" : "0", - "shadowinact" : "-1", - "shadowlastChange" : "11984", - "shadowmax" : "99999", - "shadowmin" : "0", - "shadowwarn" : "7", + "uidNumber" : 5000, + "gidNumber" : 100, + "homeDirectory" : "/ldap_homes/ldap1", + "userPassword" : "x", + "loginShell" : "/bin/bash", + "shadowExpire" : "0", + "shadowInactive" : "-1", + "shadowLastChange" : "11984", + "shadowMax" : "99999", + "shadowMin" : "0", + "shadowWarning" : "7", "type" : "ldap", "grouplist" : $[ "audio" : 1, Modified: trunk/users/package/yast2-users.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/package/yast2-users.changes (original) +++ trunk/users/package/yast2-users.changes Mon Jul 21 16:10:36 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 21 14:13:56 CEST 2008 - jsuchome@suse.cz + +- do not lowecase LDAP object names (fate#303596): + internal user/group keys (not only LDAP) adapted to new schema +- 2.17.2 + +------------------------------------------------------------------- Tue Jul 8 10:30:44 CEST 2008 - jsuchome@suse.cz - do not mention "special characters" as password content Modified: trunk/users/src/Users.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/Users.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/Users.pm (original) +++ trunk/users/src/Users.pm Mon Jul 21 16:10:36 2008 @@ -828,14 +828,14 @@ my $self = shift; my $type = $_[0]; my %ret = ( - "shadowinactive" => $useradd_defaults{"inactive"}, - "shadowexpire" => $useradd_defaults{"expire"}, - "shadowwarning" => $pass_warn_age, - "shadowmin" => $pass_min_days, - "shadowmax" => $pass_max_days, - "shadowflag" => "", - "shadowlastchange" => "", - "userpassword" => undef + "shadowInactive" => $useradd_defaults{"inactive"}, + "shadowExpire" => $useradd_defaults{"expire"}, + "shadowWarning" => $pass_warn_age, + "shadowMin" => $pass_min_days, + "shadowMax" => $pass_max_days, + "shadowFlag" => "", + "shadowLastChange" => "", + "userPassword" => undef ); if ($type eq "ldap") { %ret = %{UsersLDAP->GetDefaultShadow()}; @@ -1998,9 +1998,9 @@ if ($no_plugin && ($type eq "local" || $type eq "system") && bool ($user{"encrypted"})) { # no plugins available: local user - my $pw = $user{"userpassword"}; + my $pw = $user{"userPassword"}; if ((defined $pw) && ($pw !~ m/^\!/)) { - $user{"userpassword"} = "!".$pw; + $user{"userPassword"} = "!".$pw; } } @@ -2076,10 +2076,10 @@ if ($no_plugin && ($type eq "local" || $type eq "system") && bool ($user{"encrypted"})) { # no plugins available: local user - my $pw = $user{"userpassword"}; + my $pw = $user{"userPassword"}; if (defined $pw) { $pw =~ s/^\!//; - $user{"userpassword"} = $pw; + $user{"userPassword"} = $pw; } } @@ -2149,7 +2149,7 @@ } # password we have read was real -> set "encrypted" flag - my $pw = $user_in_work{"userpassword"}; + my $pw = $user_in_work{"userPassword"}; if (defined $pw) { if (!defined $user_in_work{"encrypted"} || bool ($user_in_work{"encrypted"})) { @@ -2186,7 +2186,7 @@ $user_in_work{"grouplist"} = FindGroupsBelongUser (\%org_user); # set 'groupname' if default group is not LDAP (#43433) if (!defined $user_in_work{"groupname"}) { - my %g = %{$self->GetGroup ($user_in_work{"gidnumber"}, "")}; + my %g = %{$self->GetGroup ($user_in_work{"gidNumber"}, "")}; if (%g && defined ($g{"cn"})) { $user_in_work{"groupname"} = $g{"cn"}; # TODO adapt the 'more_users' entry of this group? @@ -2196,7 +2196,7 @@ # empty password entry for autoinstall config (do not want to # read password from disk: #30573) if (Mode->config () && ($user_in_work{"modified"} || "") ne "imported"){ - $user_in_work{"userpassword"} = undef; + $user_in_work{"userPassword"} = undef; } } # ------------------------- initialize list of current user plugins @@ -2262,8 +2262,8 @@ # update the settings which should be changed foreach my $key (keys %data) { - if ($key eq "uid" || $key eq "homedirectory" || - $key eq "uidnumber" || $key eq "type" || $key eq "groupname") + if ($key eq "uid" || $key eq "homeDirectory" || + $key eq "uidNumber" || $key eq "type" || $key eq "groupname") { # backup the values of important keys (if not already done) my $org_key = "org_$key"; @@ -2321,7 +2321,7 @@ if ($key eq "org_user") { next; } - if ($key eq "userpassword" && (defined $data{$key}) && + if ($key eq "userPassword" && (defined $data{$key}) && (!defined $user_in_work{$key} || $data{$key} ne $user_in_work{$key}) ) { @@ -2398,7 +2398,7 @@ ($group_in_work{"what"} || "") ne "add_group") { # password we have read was real -> set "encrypted" flag - if (defined ($group_in_work{"userpassword"}) && + if (defined ($group_in_work{"userPassword"}) && (!defined $group_in_work{"encrypted"} || bool ($group_in_work{"encrypted"}))) { $group_in_work{"encrypted"} = YaST::YCP::Boolean (1); @@ -2472,7 +2472,7 @@ # update the settings which should be changed foreach my $key (keys %data) { - if ($key eq "cn" || $key eq "gidnumber" || $key eq "type") { + if ($key eq "cn" || $key eq "gidNumber" || $key eq "type") { # backup the values of important keys (if not already done) my $org_key = "org_$key"; if (defined $group_in_work{$key} && @@ -2522,7 +2522,7 @@ $group_in_work{"removed_userlist"} = \%removed; } } - if ($key eq "userpassword" && (defined $data{$key}) && + if ($key eq "userPassword" && (defined $data{$key}) && # crypt password only once (when changed) !bool ($data{"encrypted"})) { @@ -3037,7 +3037,7 @@ $key eq "disabled" || $key eq "enabled") { $user_in_work{$key} = YaST::YCP::Boolean ($data{$key}); } - elsif ($key eq "userpassword" && (defined $data{$key}) && + elsif ($key eq "userPassword" && (defined $data{$key}) && # crypt password only once !bool ($data{"encrypted"})) { @@ -3054,8 +3054,8 @@ UsersCache->SetUserType ($type); - if (!defined $user_in_work{"uidnumber"}) { - $user_in_work{"uidnumber"} = UsersCache->NextFreeUID (); + if (!defined $user_in_work{"uidNumber"}) { + $user_in_work{"uidNumber"} = UsersCache->NextFreeUID (); } my $username = $data{"uid"} || $data{"username"}; if (defined $username) { @@ -3065,11 +3065,11 @@ if (!defined $user_in_work{"cn"}) { $user_in_work{"cn"} = ""; } - if (!defined $user_in_work{"gidnumber"}) { - $user_in_work{"gidnumber"} = $self->GetDefaultGID ($type); + if (!defined $user_in_work{"gidNumber"}) { + $user_in_work{"gidNumber"} = $self->GetDefaultGID ($type); } if (!defined $user_in_work{"groupname"} || $user_in_work{"groupname"} eq "") { - my %group = %{$self->GetGroup ($user_in_work{"gidnumber"}, "")}; + my %group = %{$self->GetGroup ($user_in_work{"gidNumber"}, "")}; if (%group) { $user_in_work{"groupname"} = $group{"cn"}; } @@ -3080,11 +3080,11 @@ if (!defined $user_in_work{"grouplist"}) { $user_in_work{"grouplist"} = $self->GetDefaultGrouplist ($type); } - if (!defined $user_in_work{"homedirectory"} && defined ($username)) { - $user_in_work{"homedirectory"} = $self->GetDefaultHome ($type).$username; + if (!defined $user_in_work{"homeDirectory"} && defined ($username)) { + $user_in_work{"homeDirectory"} = $self->GetDefaultHome ($type).$username; } - if (!defined $user_in_work{"loginshell"}) { - $user_in_work{"loginshell"} = $self->GetDefaultShell ($type); + if (!defined $user_in_work{"loginShell"}) { + $user_in_work{"loginShell"} = $self->GetDefaultShell ($type); } if (!defined $user_in_work{"create_home"}) { $user_in_work{"create_home"} = YaST::YCP::Boolean (1); @@ -3098,12 +3098,12 @@ $user_in_work{$shadow_item} = $default_shadow{$shadow_item}; } } - if (!defined $user_in_work{"shadowlastchange"} || - $user_in_work{"shadowlastchange"} eq "") { - $user_in_work{"shadowlastchange"} = LastChangeIsNow (); + if (!defined $user_in_work{"shadowLastChange"} || + $user_in_work{"shadowLastChange"} eq "") { + $user_in_work{"shadowLastChange"} = LastChangeIsNow (); } -# if (!defined $user_in_work{"userpassword"}) { -# $user_in_work{"userpassword"} = ""; +# if (!defined $user_in_work{"userPassword"}) { +# $user_in_work{"userPassword"} = ""; # } if (!defined $user_in_work{"no_skeleton"} && $type eq "system") { $user_in_work{"no_skeleton"} = YaST::YCP::Boolean (1); @@ -3261,7 +3261,7 @@ # ---------------------------------------------------------------- foreach my $key (keys %data) { - if ($key eq "userpassword" && (defined $data{$key}) && + if ($key eq "userPassword" && (defined $data{$key}) && !bool ($data{"encrypted"})) { $group_in_work{$key} = @@ -3278,8 +3278,8 @@ UsersCache->SetGroupType ($type); - if (!defined $group_in_work{"gidnumber"}) { - $group_in_work{"gidnumber"} = UsersCache->NextFreeGID ($type); + if (!defined $group_in_work{"gidNumber"}) { + $group_in_work{"gidNumber"} = UsersCache->NextFreeGID ($type); } if ($type eq "ldap") { @@ -3445,8 +3445,8 @@ my $username = $user->{"uid"} || ""; my $org_username = $user->{"org_user"}{"uid"} || $username; - my $home = $user->{"homedirectory"} || ""; - my $org_home = $user->{"org_user"}{"homedirectory"} || $home; + my $home = $user->{"homeDirectory"} || ""; + my $org_home = $user->{"org_user"}{"homeDirectory"} || $home; my $home_size = $user->{"crypted_home_size"} || 0; my $org_size = $user->{"org_user"}{"crypted_home_size"} || 0; my $pw = $user->{"current_text_userpassword"}; @@ -3491,12 +3491,12 @@ } my $org_type = $user{"org_type"} || $type; my $what_user = $user{"what"}; - my $uid = $user{"uidnumber"}; - my $org_uid = $user{"org_uidnumber"} || $uid; + my $uid = $user{"uidNumber"}; + my $org_uid = $user{"org_uidNumber"} || $uid; my $username = $user{"uid"}; my $org_username = $user{"org_uid"} || $username; my $groupname = $user{"groupname"} || $self->GetDefaultGroupname ($type); - my $home = $user{"homedirectory"} || ""; + my $home = $user{"homeDirectory"} || ""; my %grouplist = (); if (defined $user{"grouplist"} && ref ($user{"grouplist"}) eq "HASH") { %grouplist = %{$user{"grouplist"}}; @@ -3660,8 +3660,8 @@ # store deleted directories... someone could want to use them if ($type ne "ldap" && bool ($user{"delete_home"})) { my $h = $home; - if (defined $user{"org_user"}{"homedirectory"}) { - $h = $user{"org_user"}{"homedirectory"}; + if (defined $user{"org_user"}{"homeDirectory"}) { + $h = $user{"org_user"}{"homeDirectory"}; } $removed_homes{$h} = $org_username; } @@ -3706,10 +3706,10 @@ } } - $user{"org_uidnumber"} = $uid; + $user{"org_uidNumber"} = $uid; $user{"org_uid"} = $username; if ($home ne "") { - $user{"org_homedirectory"} = $home; + $user{"org_homeDirectory"} = $home; } $users{$type}{$username} = \%user; if (!defined $users_by_uidnumber{$type}{$uid}) { @@ -3744,7 +3744,7 @@ my $self = shift; - if (!%group_in_work || !defined $group_in_work{"gidnumber"} || + if (!%group_in_work || !defined $group_in_work{"gidNumber"} || !defined $group_in_work{"cn"}) { return 0; } @@ -3765,8 +3765,8 @@ my $org_type = $group{"org_type"} || $type; my $groupname = $group{"cn"}; my $org_groupname = $group{"org_cn"} || $groupname; - my $gid = $group{"gidnumber"}; - my $org_gid = $group{"org_gidnumber"} || $gid; + my $gid = $group{"gidNumber"}; + my $org_gid = $group{"org_gidNumber"} || $gid; my %userlist = (); if (defined $group{"userlist"}) { %userlist = %{$group{"userlist"}}; @@ -3844,7 +3844,7 @@ %user_in_work = %{$self->GetUserByName ($user, "")}; if (%user_in_work) { $user_in_work{"groupname"} = $groupname; - $user_in_work{"gidnumber"} = $gid; + $user_in_work{"gidNumber"} = $gid; $user_in_work{"what"} = "group_change"; if ($gid != $org_gid) { $user_in_work{"what"} = "group_change_default"; @@ -3899,7 +3899,7 @@ # this has to be done due to multiple changes of groupname $group{"org_cn"} = $groupname; - $group{"org_gidnumber"} = $gid; + $group{"org_gidNumber"} = $gid; $groups{$type}{$groupname} = \%group; @@ -4043,7 +4043,7 @@ foreach my $username (keys %{$removed_users{$type}}) { my %user = %{$removed_users{$type}{$username}}; my $cmd = sprintf ("$userdel_precmd $username %i %i %s", - $user{"uidnumber"}, $user{"gidnumber"}, $user{"homedirectory"}); + $user{"uidNumber"}, $user{"gidNumber"}, $user{"homeDirectory"}); SCR->Execute (".target.bash", $cmd); }; }; @@ -4085,7 +4085,7 @@ foreach my $username (keys %{$removed_users{$type}}) { my %user = %{$removed_users{$type}{$username}}; my $cmd = sprintf ("$userdel_postcmd $username %i %i %s", - $user{"uidnumber"}, $user{"gidnumber"}, $user{"homedirectory"}); + $user{"uidNumber"}, $user{"gidNumber"}, $user{"homeDirectory"}); SCR->Execute (".target.bash", $cmd); # call the "Write" function from plugins... my $args = { @@ -4438,11 +4438,11 @@ foreach my $username (keys %{$modified_users{$type}}) { my %user = %{$modified_users{$type}{$username}}; - my $home = $user{"homedirectory"} || ""; - my $uid = $user{"uidnumber"} || 0; + my $home = $user{"homeDirectory"} || ""; + my $uid = $user{"uidNumber"} || 0; my $command = ""; my $user_mod = $user{"modified"} || "no"; - my $gid = $user{"gidnumber"}; + my $gid = $user{"gidNumber"}; my $create_home = $user{"create_home"}; my $chown_home = $user{"chown_home"}; $chown_home = 1 if (!defined $chown_home); @@ -4480,8 +4480,8 @@ } } elsif ($user_mod eq "edited" && $home ne "/var/lib/nobody") { - my $org_home = $user{"org_user"}{"homedirectory"} || $home; - my $org_uid = $user{"org_user"}{"uidnumber"} || $uid; + my $org_home = $user{"org_user"}{"homeDirectory"} || $home; + my $org_uid = $user{"org_user"}{"uidNumber"} || $uid; # chown only when directory was changed (#39417) if ($home ne $org_home || $uid ne $org_uid) { # move the home directory @@ -4818,9 +4818,9 @@ if (($ui_map{"duplicated_uid"} || -1) != $uid) { if ( (("add_user" eq ($user_in_work{"what"} || "")) || - ($uid != ($user_in_work{"uidnumber"} || 0)) || - (defined $user_in_work{"org_uidnumber"} && - $user_in_work{"org_uidnumber"} != $uid)) && + ($uid != ($user_in_work{"uidNumber"} || 0)) || + (defined $user_in_work{"org_uidNumber"} && + $user_in_work{"org_uidNumber"} != $uid)) && UsersCache->UIDExists ($uid)) { @@ -5094,9 +5094,9 @@ my $modified = (($user_in_work{"what"} || "") eq "add_user") || - ($home ne ($user_in_work{"homedirectory"} || "")) || - (defined $user_in_work{"org_homedirectory"} && - $user_in_work{"org_homedirectory"} ne $home); + ($home ne ($user_in_work{"homeDirectory"} || "")) || + (defined $user_in_work{"org_homeDirectory"} && + $user_in_work{"org_homeDirectory"} ne $home); if (!$modified) { return ""; @@ -5177,7 +5177,7 @@ $ret{"question"} = __("The home directory selected already exists. Use it and change its owner?"); - my $dir_uid = $stat{"uidnumber"} || 0; + my $dir_uid = $stat{"uidNumber"} || 0; if ($uid == $dir_uid) { # chown is not needed (#25200) # yes/no popup @@ -5212,7 +5212,7 @@ my %ret = (); if (($ui_map{"shell"} || "") ne $shell && - ($user_in_work{"loginshell"} || "") ne $shell ) { + ($user_in_work{"loginShell"} || "") ne $shell ) { if (!defined ($all_shells{$shell})) { $ret{"question_id"} = "shell"; @@ -5293,9 +5293,9 @@ if (($ui_map{"duplicated_gid"} || -1) != $gid) { if (( ("add_group" eq ($group_in_work{"what"} || "")) || - ($gid != ($group_in_work{"gidnumber"} || 0)) || - (defined $group_in_work{"org_gidnumber"} && - $group_in_work{"org_gidnumber"} != $gid)) && + ($gid != ($group_in_work{"gidNumber"} || 0)) || + (defined $group_in_work{"org_gidNumber"} && + $group_in_work{"org_gidNumber"} != $gid)) && UsersCache->GIDExists ($gid)) { $ret{"question_id"} = "duplicated_gid"; @@ -5422,7 +5422,7 @@ my $type = $user{"type"} || ""; - my $error = $self->CheckUID ($user{"uidnumber"}); + my $error = $self->CheckUID ($user{"uidNumber"}); if ($error eq "") { $error = $self->CheckUsername ($user{"uid"}); @@ -5430,14 +5430,14 @@ if ($error eq "") { # do not check pw when it wasn't changed - must be tested directly - if (defined ($user{"userpassword"}) || + if (defined ($user{"userPassword"}) || ($user{"what"} || "") eq "add_user") { - $error = UsersSimple->CheckPassword ($user{"userpassword"}, $type); + $error = UsersSimple->CheckPassword ($user{"userPassword"}, $type); } } if ($error eq "") { - $error = $self->CheckHome ($user{"homedirectory"}); + $error = $self->CheckHome ($user{"homeDirectory"}); } if ($error eq "" && $type ne "ldap") { @@ -5493,11 +5493,11 @@ my $type = $group{"type"} || ""; - my $error = $self->CheckGID ($group{"gidnumber"}); + my $error = $self->CheckGID ($group{"gidNumber"}); if ($error eq "") { - if ((defined $group{"userpassword"}) && ! bool ($group{"encrypted"})) { - $error = UsersSimple->CheckPassword ($group{"userpassword"}, $type); + if ((defined $group{"userPassword"}) && ! bool ($group{"encrypted"})) { + $error = UsersSimple->CheckPassword ($group{"userPassword"}, $type); } } @@ -5795,19 +5795,17 @@ } y2debug("Username=$username"); - my $uid = $user->{"uidnumber"}; + my $uid = $user->{"uidNumber"}; if (!defined $uid) { - $uid = $user->{"uid"}; - if (!defined $uid) { - $uid = -1; - } + $uid = $user->{"uidnumber"}; + $uid = $user->{"uid"} if (!defined $uid); + $uid = -1 if (!defined $uid); } - my $gid = $user->{"gidnumber"}; + my $gid = $user->{"gidNumber"}; if (!defined $gid) { - $gid = $user->{"gid"}; - if (!defined $gid) { - $gid = -1; - } + $gid = $user->{"gidnumber"}; + $gid = $user->{"gid"} if (!defined $gid); + $gid = -1 if (!defined $gid); } if ($cn eq "") { @@ -5873,7 +5871,7 @@ $finalpw = $pass; } else { - $finalpw = $existing{"userpassword"}; + $finalpw = $existing{"userPassword"}; } if (!defined $user->{"forename"} && !defined $user->{"surname"} && @@ -5881,19 +5879,19 @@ $cn = $existing{"cn"} || ""; } if ($gid == -1) { - $gid = $existing{"gidnumber"}; + $gid = $existing{"gidNumber"}; } %ret = ( - "userpassword" => $finalpw, + "userPassword" => $finalpw, "grouplist" => \%grouplist, "uid" => $username, "encrypted" => $encrypted, "cn" => $cn, - "uidnumber" => $existing{"uidnumber"}, - "loginshell" => $user->{"shell"} || $user->{"loginshell"} || $existing{"loginshell"} || $self->GetDefaultShell ($type), + "uidNumber" => $existing{"uidNumber"}, + "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $existing{"loginShell"} || $self->GetDefaultShell ($type), - "gidnumber" => $gid, - "homedirectory" => $user->{"homedirectory"} || $user->{"home"} || $existing{"homedirectory"} || $home, + "gidNumber" => $gid, + "homeDirectory" => $user->{"homeDirectory"} || $user->{"home"} || $existing{"homeDirectory"} || $home, "type" => $type, "modified" => "imported" ); @@ -5907,36 +5905,44 @@ %ret = ( "uid" => $username, "encrypted" => $encrypted, - "userpassword" => $pass, + "userPassword" => $pass, "cn" => $cn, - "uidnumber" => $uid, - "gidnumber" => $gid, - "loginshell" => $user->{"shell"} || $user->{"loginshell"} || $self->GetDefaultShell ($type), + "uidNumber" => $uid, + "gidNumber" => $gid, + "loginShell" => $user->{"shell"} || $user->{"loginShell"} || $self->GetDefaultShell ($type), "grouplist" => \%grouplist, - "homedirectory" => $user->{"homedirectory"} || $user->{"home"} || $home, + "homeDirectory" => $user->{"homeDirectory"} || $user->{"home"} || $home, "type" => $type, "modified" => "imported" ); } my %translated = ( - "inact" => "shadowinactive", - "expire" => "shadowexpire", - "warn" => "shadowwarning", - "min" => "shadowmin", - "max" => "shadowmax", - "flag" => "shadowflag", - "last_change" => "shadowlastchange", - "password" => "userpassword", + "inact" => "shadowInactive", + "expire" => "shadowExpire", + "warn" => "shadowWarning", + "min" => "shadowMin", + "max" => "shadowMax", + "flag" => "shadowFlag", + "last_change" => "shadowLastChange", + "password" => "userPassword", + "shadowinactive"=> "shadowInactive", + "shadowexpire" => "shadowExpire", + "shadowwarning" => "shadowWarning", + "shadowmin" => "shadowMin", + "shadowmax" => "shadowMax", + "shadowflag" => "shadowFlag", + "shadowlastchange" => "shadowLastChange", + "userpassword" => "userPassword", ); foreach my $key (keys %user_shadow) { my $new_key = $translated{$key} || $key; - if ($key eq "userpassword") { next; } + if ($key eq "userPassword") { next; } $ret{$new_key} = $user_shadow{$key}; } - if (!defined $ret{"shadowlastchange"} || - $ret{"shadowlastchange"} eq "") { - $ret{"shadowlastchange"} = LastChangeIsNow (); + if (!defined $ret{"shadowLastChange"} || + $ret{"shadowLastChange"} eq "") { + $ret{"shadowLastChange"} = LastChangeIsNow (); } return \%ret; } @@ -5956,18 +5962,17 @@ $groupname = $group{"cn"} || ""; } - my $gid = $group{"gidnumber"}; + my $gid = $group{"gidNumber"}; if (!defined $gid) { - $gid = $group{"gid"}; - if (!defined $gid) { - $gid = -1; - } + $gid = $group{"gidnumber"}; + $gid = $group{"gid"} if (!defined $gid); + $gid = -1 if (!defined $gid); } if ($gid == -1) { # check for existence of this group (and change it with given values) my $existing = $self->GetGroupByName ($groupname, ""); if (ref ($existing) eq "HASH" && %{$existing}) { - $gid = $existing->{"gidnumber"}; + $gid = $existing->{"gidNumber"}; $type = $existing->{"type"} || $type; } } @@ -5989,9 +5994,9 @@ } } my %ret = ( - "userpassword" => $group{"group_password"}, + "userPassword" => $group{"group_password"}, "cn" => $groupname, - "gidnumber" => $gid, + "gidNumber" => $gid, "userlist" => \%userlist, "modified" => "imported", "type" => $type @@ -6025,7 +6030,7 @@ $groups_by_gidnumber{"local"} = {}; if (%group_users) { $groups{"local"}{"users"} = \%group_users; - my $gid = $group_users{"gidnumber"}; + my $gid = $group_users{"gidNumber"}; $groups_by_gidnumber{"local"}{$gid} = { "users" => 1 }; RemoveDiskUsersFromGroups ($groups{"local"}); } @@ -6114,9 +6119,9 @@ my %user = %{$self->ImportUser ($imp_user)}; my $type = $user{"type"} || "local"; my $username = $user{"uid"} || ""; - my $uid = $user{"uidnumber"}; + my $uid = $user{"uidNumber"}; if (!defined $uid || $uid == -1) { - delete $user{"uidnumber"}; + delete $user{"uidNumber"}; push @without_uid, \%user; } else { @@ -6172,9 +6177,9 @@ foreach my $imp_group (@{$settings{"groups"}}) { my %group = %{$self->ImportGroup ($imp_group)}; - my $gid = $group{"gidnumber"}; + my $gid = $group{"gidNumber"}; if (!defined $gid || $gid == -1) { - delete $group{"gidnumber"}; + delete $group{"gidNumber"}; push @without_gid, \%group; } else { @@ -6214,9 +6219,9 @@ # group 'users' must be created my $gid = $self->GetDefaultGID ("local"); %group_u = ( - "gidnumber" => $gid, + "gidNumber" => $gid, "cn" => "users", - "userpassword" => undef, + "userPassword" => undef, "userlist" => {}, "type" => "local" ); @@ -6243,8 +6248,8 @@ foreach my $username (keys %{$users{$type}}) { my $user = $users{$type}{$username}; - my $uid = $user->{"uidnumber"} || 0; - my $gid = $user->{"gidnumber"}; + my $uid = $user->{"uidNumber"} || 0; + my $gid = $user->{"gidNumber"}; if (!defined $gid) { $gid = $self->GetDefaultGID($type); } @@ -6264,7 +6269,7 @@ %group = %{$self->GetGroup ($gid, "")}; # adapt user's gid to new one: if (%group) { - $users{$type}{$username}{"gidnumber"} = $gid; + $users{$type}{$username}{"gidNumber"} = $gid; } } if (defined $group{"cn"}) { @@ -6282,12 +6287,12 @@ # check if root password is set (bug #76404) if (Mode->autoinst ()) { my %root_user = %{$self->GetUserByName ("root", "system")}; - if (%root_user && (($root_user{"userpassword"} || "") eq "")) { + if (%root_user && (($root_user{"userPassword"} || "") eq "")) { my $pw = Linuxrc->InstallInf ("RootPassword"); if (defined $pw){ - $root_user{"userpassword"} = + $root_user{"userPassword"} = $self->CryptPassword ($pw, "system"); $users{"system"}{"root"} = \%root_user; @@ -6338,14 +6343,14 @@ my $username = $user->{"uid"} || ""; my %user_shadow = (); my %translated = ( - "shadowinactive" => "inact", - "shadowexpire" => "expire", - "shadowwarning" => "warn", - "shadowmin" => "min", - "shadowmax" => "max", - "shadowflag" => "flag", - "shadowlastchange" => "last_change", - "userpassword" => "password" + "shadowInactive" => "inact", + "shadowExpire" => "expire", + "shadowWarning" => "warn", + "shadowMin" => "min", + "shadowMax" => "max", + "shadowFlag" => "flag", + "shadowLastChange" => "last_change", + "userPassword" => "password" ); my %shadow_map = %{$self->CreateShadowMap ($user)}; my %org_user = (); @@ -6356,7 +6361,7 @@ foreach my $key (keys %shadow_map) { my $new_key = $translated{$key} || $key; # actual shadowlastchange must be created in Import - if ($key eq "userpassword" || $key eq "shadowlastchange" || + if ($key eq "userPassword" || $key eq "shadowLastChange" || (defined $org_user{$key} && $shadow_map{$key} eq $org_user{$key} && ($user->{"modified"} || "") ne "imported")) { @@ -6386,12 +6391,12 @@ # change the key names my %keys_to_export = ( - "userpassword" => "user_password", + "userPassword" => "user_password", "cn" => "fullname", - "loginshell" => "shell", - "uidnumber" => "uid", - "gidnumber" => "gid", - "homedirectory" => "home" + "loginShell" => "shell", + "uidNumber" => "uid", + "gidNumber" => "gid", + "homeDirectory" => "home" ); foreach my $key (keys %exported_user) { if (defined $keys_to_export{$key}) { @@ -6431,17 +6436,17 @@ ); if (($group->{"modified"} || "edited") ne "edited" || (defined $group->{"org_group"} && - (defined $group->{"org_group"}{"gidnumber"} && - $group->{"gidnumber"} ne $group->{"org_group"}{"gidnumber"}) + (defined $group->{"org_group"}{"gidNumber"} && + $group->{"gidNumber"} ne $group->{"org_group"}{"gidNumber"}) || (defined $group->{"org_group"}{"cn"} && $group->{"cn"} ne $group->{"org_group"}{"cn"})) ) { - $ret{"gid"} = $group->{"gidnumber"}; + $ret{"gid"} = $group->{"gidNumber"}; } - if (defined $group->{"userpassword"}) { - $ret{"group_password"} = $group->{"userpassword"}; + if (defined $group->{"userPassword"}) { + $ret{"group_password"} = $group->{"userPassword"}; } return \%ret; @@ -6517,7 +6522,7 @@ if (!defined $users{$type}) { next; } while (my ($username, $user) = each %{$users{$type}}) { if (defined $user->{"modified"}) { - $ret .= sprintf (" %i $username %s<br>", $user->{"uidnumber"} || 0, $user->{"cn"} || ""); + $ret .= sprintf (" %i $username %s<br>", $user->{"uidNumber"} || 0, $user->{"cn"} || ""); } } } @@ -6527,7 +6532,7 @@ if (!defined $groups{$type}) { next; } while (my ($groupname, $group) = each %{$groups{$type}}) { if (defined $group->{"modified"}) { - $ret .= sprintf (" %i $groupname<br>", $group->{"gidnumber"} || 0); + $ret .= sprintf (" %i $groupname<br>", $group->{"gidNumber"} || 0); } } } Modified: trunk/users/src/UsersCache.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersCache.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersCache.pm (original) +++ trunk/users/src/UsersCache.pm Mon Jul 21 16:10:36 2008 @@ -721,7 +721,7 @@ my $self = shift; my %user = %{$_[0]}; - my $uid = PadBefore ($user{"uidnumber"}); + my $uid = PadBefore ($user{"uidNumber"}); my $username = $user{"uid"} || ""; my $full = $user{"cn"} || ""; if (defined $user{"gecos"} && $user{"gecos"} ne "") { @@ -790,7 +790,7 @@ my $self = shift; my %group = %{$_[0]}; - my $gid = PadBefore ($group{"gidnumber"}); + my $gid = PadBefore ($group{"gidNumber"}); my $groupname = $group{"cn"} || ""; my %userlist = (); @@ -877,10 +877,10 @@ my $what = $user{"what"}; my $type = $user{"type"} || ""; my $org_type = $user{"org_type"} || $type; - my $uid = $user{"uidnumber"}; - my $org_uid = $user{"org_uidnumber"} || $uid; - my $home = $user{"homedirectory"} || ""; - my $org_home = $user{"org_homedirectory"} || $home; + my $uid = $user{"uidNumber"}; + my $org_uid = $user{"org_uidNumber"} || $uid; + my $home = $user{"homeDirectory"} || ""; + my $org_home = $user{"org_homeDirectory"} || $home; my $username = $user{"uid"}; my $org_username = $user{"org_uid"} || $username; @@ -984,8 +984,8 @@ my $org_type = $group{"org_type"} || $type; my $groupname = $group{"cn"} || ""; my $org_groupname = $group{"org_cn"} || $groupname; - my $gid = $group{"gidnumber"}; - my $org_gid = $group{"org_gidnumber"} || $gid; + my $gid = $group{"gidNumber"}; + my $org_gid = $group{"org_gidNumber"} || $gid; if ($what eq "add_group") { $gids{$type}{$gid} = ($gids{$type}{$gid} || 0) + 1; @@ -1084,7 +1084,7 @@ if (defined ($username)) { $usernames{$type}{$username} = 1; } - my $home = $map_of_users{$uid}{"homedirectory"}; + my $home = $map_of_users{$uid}{"homeDirectory"}; if (defined ($home)) { $homes{$type}{$home} = 1; } Modified: trunk/users/src/UsersLDAP.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersLDAP.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersLDAP.pm (original) +++ trunk/users/src/UsersLDAP.pm Mon Jul 21 16:10:36 2008 @@ -42,8 +42,8 @@ my $group_base = ""; # default filters for searching -my $default_user_filter = "objectclass=posixaccount"; -my $default_group_filter = "objectclass=posixgroup"; +my $default_user_filter = "objectClass=posixAccount"; +my $default_group_filter = "objectClass=posixGroup"; # which attribute have groups for list of members my $member_attribute = "member"; @@ -71,11 +71,11 @@ # default object classes of LDAP users (read from Ldap module) my @user_class = - ("top","posixaccount","shadowaccount", "inetorgperson"); + ("top","posixAccount","shadowAccount", "inetOrgPerson"); # default object classes of LDAP groups (read from Ldap module) my @group_class = - ( "top", "posixgroup", "groupofnames"); + ( "top", "posixGroup", "groupOfNames"); # attributes for LDAP search; if empty, all non-empty attrs will be returned my @user_attributes = (); @@ -116,7 +116,7 @@ ("create_home", "grouplist", "groupname", "modified", "org_username", "org_uid", "plugins", "text_userpassword", "current_text_userpassword", "plugins_to_remove", "plugin_modified", - "org_uidnumber", "org_homedirectory","org_user", "type", "org_groupname", + "org_uidNumber", "org_homeDirectory","org_user", "type", "org_groupname", "org_type", "what", "encrypted", "no_skeleton", "disabled", "enabled", "dn", "org_dn", "removed_grouplist", "delete_home", "addit_data", "warning_message", "warning_message_ID", "confirmed_warnings", "home_mode", @@ -124,7 +124,7 @@ my @group_internal_keys = ("modified", "type", "more_users", "s_userlist", "encrypted", "org_type", - "dn", "org_dn", "org_groupname", "org_gidnumber", "removed_userlist", + "dn", "org_dn", "org_groupname", "org_gidNumber", "removed_userlist", "what", "org_cn", "plugins", "plugins_to_remove", "org_group", "warning_message", "warning_message_ID", "confirmed_warnings", "plugin_modified"); @@ -240,27 +240,27 @@ my %modules = %{Ldap->GetConfigModules ()}; while ( my ($dn, $config_module) = each %modules) { - if (!defined $config_module->{"objectclass"}) { + if (!defined $config_module->{"objectClass"}) { next; } - my $oc = $config_module->{"objectclass"}; - if (contains ($oc, "suseuserconfiguration", 1) ) { + my $oc = $config_module->{"objectClass"}; + if (contains ($oc, "suseUserConfiguration", 1) ) { $user_config_dn = $dn; %user_config = %{$config_module}; } - if (contains ($oc, "susegroupconfiguration", 1) ) { + if (contains ($oc, "suseGroupConfiguration", 1) ) { $group_config_dn = $dn; %group_config = %{$config_module}; } }; my @user_templates = (); - if (defined $user_config{"susedefaulttemplate"}) { - @user_templates = @{$user_config{"susedefaulttemplate"}}; + if (defined $user_config{"suseDefaultTemplate"}) { + @user_templates = @{$user_config{"suseDefaultTemplate"}}; } my @group_templates = (); - if (defined $group_config{"susedefaulttemplate"}) { - @group_templates = @{$group_config{"susedefaulttemplate"}}; + if (defined $group_config{"suseDefaultTemplate"}) { + @group_templates = @{$group_config{"suseDefaultTemplate"}}; } my $user_template_dn = $user_templates[0] || ""; my $group_template_dn = $group_templates[0] || ""; @@ -300,11 +300,11 @@ if ($init ne "") { return $init; } # get the default filters from config modules (already read) - if (defined $user_config{"susesearchfilter"}[0]) { - $default_user_filter = @{$user_config{"susesearchfilter"}}[0]; + if (defined $user_config{"suseSearchFilter"}[0]) { + $default_user_filter = @{$user_config{"suseSearchFilter"}}[0]; } - if (defined $group_config{"susesearchfilter"}[0]) { - $default_group_filter = @{$group_config{"susesearchfilter"}}[0]; + if (defined $group_config{"suseSearchFilter"}[0]) { + $default_group_filter = @{$group_config{"suseSearchFilter"}}[0]; } $filters_read = 1; @@ -331,8 +331,8 @@ my %tmp_group_template = %group_template; # every time take the first value from the list... - if (defined $user_config{"susedefaultbase"}[0]) { - $user_base = $user_config{"susedefaultbase"}[0]; + if (defined $user_config{"suseDefaultBase"}[0]) { + $user_base = $user_config{"suseDefaultBase"}[0]; # ask to create if not present my $base_map = Ldap->GetLDAPEntry ($user_base); if (ref ($base_map) eq "HASH" && !%$base_map) { @@ -346,7 +346,7 @@ { if (Ldap->ParentExists ($dn) && Ldap->WriteLDAP ( { $dn => { - "objectclass" => [ "top", "organizationalunit"], + "objectClass" => [ "top", "organizationalUnit"], "modified" => "added", "ou" => UsersCache->get_first ($dn) }})) { @@ -359,8 +359,8 @@ $user_base = Ldap->GetDomain(); } - if (defined $group_config{"susedefaultbase"}[0]) { - $group_base = $group_config{"susedefaultbase"}[0]; + if (defined $group_config{"suseDefaultBase"}[0]) { + $group_base = $group_config{"suseDefaultBase"}[0]; my $base_map = Ldap->GetLDAPEntry ($group_base); if (ref ($base_map) eq "HASH" && !%$base_map) { my $dn = $group_base; @@ -372,7 +372,7 @@ { if (Ldap->ParentExists ($dn) && Ldap->WriteLDAP ( { $dn => { - "objectclass" => [ "top", "organizationalunit"], + "objectClass" => [ "top", "organizationalUnit"], "modified" => "added", "ou" => UsersCache->get_first ($dn) }})) { @@ -386,70 +386,87 @@ } $member_attribute = Ldap->member_attribute (); - if (defined $user_template{"suseplugin"}) { - @default_user_plugins = @{$user_template{"suseplugin"}}; + if (defined $user_template{"susePlugin"}) { + @default_user_plugins = @{$user_template{"susePlugin"}}; } - if (defined $group_template{"suseplugin"}) { - @default_group_plugins = @{$group_template{"suseplugin"}}; + if (defined $group_template{"susePlugin"}) { + @default_group_plugins = @{$group_template{"susePlugin"}}; } + # change the case-insensitive keys back to sensitive ones + my %translated = ( + "homedirectory" => "homeDirectory", + "uidnumber" => "uidNumber", + "loginshell" => "loginShell", + "gidnumber" => "gidNumber", + ); + if (defined $user_template{"default_values"}) { - %user_defaults = %{$user_template{"default_values"}}; + my %user_defs = %{$user_template{"default_values"}}; + # update possible wrong (lowercased) names to the correct ones + foreach my $key (keys %user_defs) { + my $new_key = $translated{$key} || $key; + $user_defaults{$new_key} = $user_defs{$key}; + } } if (defined $group_template{"default_values"}) { - %group_defaults = %{$group_template{"default_values"}}; + my %group_defs = %{$group_template{"default_values"}}; + foreach my $key (keys %group_defs) { + my $new_key = $translated{$key} || $key; + $group_defaults{$new_key} = $group_defs{$key}; + } } # default shadow for new LDAP users - foreach my $key ("shadowwarning", "shadowinactive", "shadowexpire", "shadowmin", "shadowmax", "shadowflag") { + foreach my $key ("shadowWarning", "shadowInactive", "shadowExpire", "shadowMin", "shadowMax", "shadowFlag") { if (defined $user_defaults{$key}) { $shadow{$key} = $user_defaults{$key}; } } - if (defined $user_defaults{"homedirectory"}) { - $useradd_defaults{"home"} = $user_defaults{"homedirectory"}; + if (defined $user_defaults{"homeDirectory"}) { + $useradd_defaults{"home"} = $user_defaults{"homeDirectory"}; } - if (defined $user_defaults{"gidnumber"}) { - $useradd_defaults{"group"} = $user_defaults{"gidnumber"}; + if (defined $user_defaults{"gidNumber"}) { + $useradd_defaults{"group"} = $user_defaults{"gidNumber"}; } - if (defined $user_defaults{"loginshell"}) { - $useradd_defaults{"shell"} = $user_defaults{"loginshell"}; + if (defined $user_defaults{"loginShell"}) { + $useradd_defaults{"shell"} = $user_defaults{"loginShell"}; } - if (defined $user_config{"suseskeldir"}[0]) { - $useradd_defaults{"skel"} = $user_config{"suseskeldir"}[0]; + if (defined $user_config{"suseSkelDir"}[0]) { + $useradd_defaults{"skel"} = $user_config{"suseSkelDir"}[0]; } # set default secondary groups # Warning: there are DN's, but we want (?) only names... - if (defined ($user_template{"susesecondarygroup"})) { + if (defined ($user_template{"suseSecondaryGroup"})) { my @grouplist = (); - foreach my $dn (@{$user_template{"susesecondarygroup"}}) { + foreach my $dn (@{$user_template{"suseSecondaryGroup"}}) { push @grouplist, UsersCache->get_first ($dn); } $useradd_defaults{"groups"} = join (",", @grouplist); }; # password length (there is no check if it is correct for current hash) - if (defined ($user_config{"suseminpasswordlength"}[0])) { - $min_pass_length = $user_config{"suseminpasswordlength"}[0]; + if (defined ($user_config{"suseMinPasswordLength"}[0])) { + $min_pass_length = $user_config{"suseMinPasswordLength"}[0]; } - if (defined ($user_config{"susemaxpasswordlength"}[0])) { - $max_pass_length = $user_config{"susemaxpasswordlength"}[0]; + if (defined ($user_config{"suseMaxPasswordLength"}[0])) { + $max_pass_length = $user_config{"suseMaxPasswordLength"}[0]; } # last used Id - if (defined ($user_config{"susenextuniqueid"}[0])) { - $last_uid = $user_config{"susenextuniqueid"}[0]; + if (defined ($user_config{"suseNextUniqueId"}[0])) { + $last_uid = $user_config{"suseNextUniqueId"}[0]; } else { $last_uid = UsersCache->GetLastUID ("local"); } UsersCache->SetLastUID ($last_uid, "ldap"); - if (defined ($group_config{"susenextuniqueid"}[0])) { - $last_gid = $group_config{"susenextuniqueid"}[0]; + if (defined ($group_config{"suseNextUniqueId"}[0])) { + $last_gid = $group_config{"suseNextUniqueId"}[0]; } else { $last_gid = UsersCache->GetLastGID ("local"); @@ -457,35 +474,35 @@ UsersCache->SetLastGID ($last_gid, "ldap"); # naming attributes - if (defined ($user_template{"susenamingattribute"}[0])) { - $user_naming_attr = $user_template{"susenamingattribute"}[0]; + if (defined ($user_template{"suseNamingAttribute"}[0])) { + $user_naming_attr = $user_template{"suseNamingAttribute"}[0]; } - if (defined ($group_template{"susenamingattribute"}[0])) { - $group_naming_attr = $group_template{"susenamingattribute"}[0]; + if (defined ($group_template{"suseNamingAttribute"}[0])) { + $group_naming_attr = $group_template{"suseNamingAttribute"}[0]; } # max id - if (defined ($user_config{"susemaxuniqueid"}[0])) { - $max_uid = $user_config{"susemaxuniqueid"}[0]; + if (defined ($user_config{"suseMaxUniqueId"}[0])) { + $max_uid = $user_config{"suseMaxUniqueId"}[0]; } - if (defined ($group_config{"susemaxuniqueid"}[0])) { - $max_gid = $group_config{"susemaxuniqueid"}[0]; + if (defined ($group_config{"suseMaxUniqueId"}[0])) { + $max_gid = $group_config{"suseMaxUniqueId"}[0]; } UsersCache->SetMaxUID ($max_uid, "ldap"); UsersCache->SetMaxGID ($max_gid, "ldap"); # min id - if (defined ($user_config{"suseminuniqueid"}[0])) { - $min_uid = $user_config{"suseminuniqueid"}[0]; + if (defined ($user_config{"suseMinUniqueId"}[0])) { + $min_uid = $user_config{"suseMinUniqueId"}[0]; } - if (defined ($group_config{"suseminuniqueid"}[0])) { - $min_gid = $group_config{"suseminuniqueid"}[0]; + if (defined ($group_config{"suseMinUniqueId"}[0])) { + $min_gid = $group_config{"suseMinUniqueId"}[0]; } UsersCache->SetMinUID ($min_uid, "ldap"); UsersCache->SetMinGID ($min_gid, "ldap"); - if (defined ($user_config{"susepasswordhash"}[0])) { - $encryption = $user_config{"susepasswordhash"}[0]; + if (defined ($user_config{"susePasswordHash"}[0])) { + $encryption = $user_config{"susePasswordHash"}[0]; } else { $encryption = Ldap->pam_password (); @@ -511,7 +528,7 @@ my $user_attrs = \@user_attributes; if (@$user_attrs < 1) { - $user_attrs = [ "uid", "uidnumber", "gidnumber", "gecos", "cn", "homedirectory", "userpassword" ]; + $user_attrs = [ "uid", "uidNumber", "gidNumber", "gecos", "cn", "homeDirectory", "userPassword" ]; y2milestone ("minimal set of user attrs to read: ", @$user_attrs); } my $group_attrs = \@group_attributes; @@ -967,7 +984,7 @@ # LDAP types to internal yast-names. # @param what "user" or "group" # @param data map of already gathered keys and values -# @example map of default values contains pair "homedirectory": "/home/%uid" +# @example map of default values contains pair "homeDirectory": "/home/%uid" # -> value of "home" is set to "/home/" + username # @return new data map with substituted values BEGIN { $TYPEINFO{SubstituteValues} = ["function", @@ -988,7 +1005,7 @@ if (Mode->test ()) { %defaults = ( - "homedirectory" => "/home/\%uid", + "homeDirectory" => "/home/\%uid", "cn" => "\%uid", ) } @@ -996,8 +1013,7 @@ # 'value' of 'attr' should be changed foreach my $attr (keys %{$data}) { - my $lattr = lc ($attr); - my $value = $data->{$lattr}; + my $value = $data->{$attr}; my $svalue = ""; if (!defined $value || ref ($value) eq "HASH") { @@ -1010,26 +1026,27 @@ $svalue = $value; } # substitute only when current value is empty or contains "%" +# FIXME homedirectory already defined -> what now? if (!defined $svalue || - contains (\@internal, $lattr, 1) || + contains (\@internal, $attr, 1) || ($svalue ne "" && !($svalue =~ m/%/))) { next; } # translate attribute names from LDAP to yast-type - my $val = $defaults{$lattr}; + my $val = $defaults{$attr}; if (defined ($val) && $val =~ m/%/) { my @parts = split (/%/, $val); my $result = $parts[0]; my $i = 1; while ($i < @parts) { - my $part = lc ($parts[$i]); + my $part = $parts[$i]; my $replaced = 0; # find a contens of substitution (filled in current user/group) foreach my $at (sort keys %{$data}) { - my $a = lc ($at); - my $v = $data->{$a}; - if (!defined $v || contains (\@internal, $a, 1) || $replaced){ + my $v = $data->{$at}; + if (!defined $v || contains (\@internal, $at, 1) || + $replaced) { next; } if (ref ($v) eq "HASH") { @@ -1039,8 +1056,8 @@ if (ref ($v) eq "ARRAY") { $sv = $v->[0]; } - if (substr ($part, 0, length ($a)) eq $a) { - $result = $result.$sv.substr ($part, length ($a)); + if (substr ($part, 0, length ($at)) eq $at) { + $result = $result.$sv.substr ($part, length ($at)); $replaced = 1; } } @@ -1050,8 +1067,8 @@ $i ++; } if ($result ne $svalue) { - y2milestone ("attribute '$lattr' changed from '$svalue' to '$result'"); - $ret{$lattr} = $result; + y2milestone ("attribute '$attr' changed from '$svalue' to '$result'"); + $ret{$attr} = $result; } } } @@ -1093,13 +1110,13 @@ if (defined $data->{"org_group"} && $data->{"modified"} eq "edited") { $org_object = $data->{"org_group"}; } - if (defined $org_object->{"objectclass"}) { - $org_ocs = $org_object->{"objectclass"}; + if (defined $org_object->{"objectClass"}) { + $org_ocs = $org_object->{"objectClass"}; } my %ret = (); my @attributes = (); - my $attributes = Ldap->GetObjectAttributes ($data->{"objectclass"}); + my $attributes = Ldap->GetObjectAttributes ($data->{"objectClass"}); if (defined $attributes && ref ($attributes) eq "ARRAY") { @attributes = @{$attributes}; } @@ -1108,7 +1125,7 @@ my @ocs = (); foreach my $oc (@$org_ocs) { # object class was deleted - if (!contains ($data->{"objectclass"}, $oc, 1)) { + if (!contains ($data->{"objectClass"}, $oc, 1)) { push @ocs, $oc; } } @@ -1118,7 +1135,7 @@ } my @internal = @user_internal_keys; - if (!defined $data->{"uidnumber"}) { + if (!defined $data->{"uidNumber"}) { @internal = @group_internal_keys; } foreach my $key (keys %{$data}) { @@ -1126,7 +1143,7 @@ if (contains (\@internal, $key, 1)) { next; } - if ($key eq "userpassword") { + if ($key eq "userPassword") { if (!defined $val) { next; } @@ -1153,7 +1170,7 @@ } } - # check if the attributes are allowed by objectclass + # check if the attributes are allowed by objectClass if (!contains (\@attributes, $key, 1)) { if (contains ($old_attributes, $key, 1)) { # remove the old attribute @@ -1166,8 +1183,10 @@ $attribute_usage->{$key} = $at->{'usage'}; $attribute_usage->{$key} = 0 if not defined $at->{'usage'}; } - # 1, 2 and 3 are operational attributes, they do not require object class - # 0=userApplications, 1=directoryOperation, 2=distributedOperation, 3=dSAOperation + # 1, 2 and 3 are operational attributes, they do not require + # object class: + # 0=userApplications, 1=directoryOperation, + # 2=distributedOperation, 3=dSAOperation if ($attribute_usage->{$key} < 1) { y2warning ("Attribute '$key' is not allowed by schema."); next; @@ -1256,11 +1275,11 @@ if (!defined ($action) || defined ($ret{"msg"})) { next; } - my $uid = $user->{"uidnumber"}; + my $uid = $user->{"uidNumber"}; if (! defined $uid) { $uid = GetDefaultUID (); } - my $home = $user->{"homedirectory"} || ""; - my $org_home = $user->{"org_user"}{"homedirectory"} || $home; - my $gid = $user->{"gidnumber"}; + my $home = $user->{"homeDirectory"} || ""; + my $org_home = $user->{"org_user"}{"homeDirectory"} || $home; + my $gid = $user->{"gidNumber"}; if (!defined $gid) { $gid = GetDefaultGID (); } my $create_home = bool ($user->{"create_home"}); my $chown_home = $user->{"chown_home"}; @@ -1277,9 +1296,9 @@ my $dn = $user->{"dn"} || ""; my $org_dn = $user->{"org_user"}{"dn"} || $dn; my @obj_classes = @user_class; - if (defined $user->{"objectclass"} && - ref ($user->{"objectclass"}) eq "ARRAY") { - @obj_classes= @{$user->{"objectclass"}}; + if (defined $user->{"objectClass"} && + ref ($user->{"objectClass"}) eq "ARRAY") { + @obj_classes= @{$user->{"objectClass"}}; } # check allowed object classes my @ocs = (); @@ -1289,7 +1308,7 @@ push @ocs, $oc; } } - $user->{"objectclass"} = \@ocs; + $user->{"objectClass"} = \@ocs; } my $mode = 777 - String->CutZeros ($umask); if (defined ($user->{"home_mode"})) { @@ -1461,14 +1480,14 @@ } if ($last_id != $last_uid && $user_config_dn ne "") { # set nextuniqueid in user config module - $user_config{"susenextuniqueid"} = [ $last_id ]; + $user_config{"suseNextUniqueId"} = [ $last_id ]; my %modules = ( $user_config_dn => { "modified" => "edited" } ); - $modules{$user_config_dn}{"susenextuniqueid"} = - $user_config{"susenextuniqueid"}; + $modules{$user_config_dn}{"suseNextUniqueId"} = + $user_config{"suseNextUniqueId"}; my %new_ret = %{Ldap->WriteToLDAP (\%modules)}; %ret = %new_ret if not defined $ret{"msg"}; } @@ -1506,7 +1525,7 @@ if (!defined ($action) || defined ($ret{"msg"})) { next; } - my $gid = $group->{"gidnumber"}; + my $gid = $group->{"gidNumber"}; if (!defined $gid) { $gid = GetDefaultGID (); } my %new_group = (); my $dn = $group->{"dn"} || ""; @@ -1516,19 +1535,19 @@ my $plugin_error = ""; my @obj_classes = @group_class; - if (defined $group->{"objectclass"} && - ref ($group->{"objectclass"}) eq "ARRAY") { - @obj_classes= @{$group->{"objectclass"}}; + if (defined $group->{"objectClass"} && + ref ($group->{"objectClass"}) eq "ARRAY") { + @obj_classes= @{$group->{"objectClass"}}; } my %o_classes = (); foreach my $oc (@obj_classes) { - $o_classes{lc($oc)} = 1; + $o_classes{$oc} = 1; } - my $group_oc = "groupofnames"; - my $other_oc = "groupofuniquenames"; + my $group_oc = "groupOfNames"; + my $other_oc = "groupOfUniqueNames"; if (lc($member_attribute) eq "uniquemember") { - $group_oc = "groupofuniquenames"; - $other_oc = "groupofnames"; + $group_oc = "groupOfUniqueNames"; + $other_oc = "groupOfNames"; } # if there is no member of the group, group must be changed # to namedObject @@ -1538,23 +1557,23 @@ { if ($action eq "added" || $action eq "edited") { delete $o_classes{$group_oc}; - $o_classes{"namedobject"} = 1; + $o_classes{"namedObject"} = 1; } if ($action eq "edited") { - # delete old group and create new with altered objectclass + # delete old group and create new with altered objectClass %new_group = %{$group}; $action = "deleted"; } } # we are adding users to empty group (=namedObject): - # group must be changed to groupofuniquenames/groupofnames + # group must be changed to groupOfUniqueNames/groupOfNames elsif (%{$group->{$member_attribute}} && $action eq "edited" && !defined $o_classes{$group_oc}) { # delete old group... $action = "deleted"; - # ... and create new one with altered objectclass - delete $o_classes{"namedobject"}; + # ... and create new one with altered objectClass + delete $o_classes{"namedObject"}; $o_classes{$group_oc} = 1; if (defined $o_classes{$other_oc}) { delete $o_classes{$other_oc}; @@ -1567,7 +1586,7 @@ push @ocs, $oc; } } - $group->{"objectclass"} = \@ocs; + $group->{"objectClass"} = \@ocs; # ----------- now call the WriteBefore plugin function for this group if (!defined $plugins) { @@ -1710,11 +1729,11 @@ $ret{"msg"} = $plugin_error; last; # stop processing LDAP write... } - # now add new group with modified objectclass + # now add new group with modified objectClass if (lc ($dn) ne lc ($org_dn)) { $arg_map{"dn"} = $dn; } - $new_group{"objectclass"} = \@ocs; + $new_group{"objectClass"} = \@ocs; # remove the org_group submap, we are adding new group: delete $new_group{"org_group"}; if (!SCR->Write (".ldap.add", \%arg_map, @@ -1755,14 +1774,14 @@ } if ($last_id != $last_gid && $group_config_dn ne "") { # set nextuniqueid in group config module - $group_config{"susenextuniqueid"} = [ $last_id ]; + $group_config{"suseNextUniqueId"} = [ $last_id ]; my %modules = ( $group_config_dn => { "modified" => "edited" } ); - $modules{$group_config_dn}{"susenextuniqueid"} = - $group_config{"susenextuniqueid"}; + $modules{$group_config_dn}{"suseNextUniqueId"} = + $group_config{"suseNextUniqueId"}; my %new_ret = %{Ldap->WriteToLDAP (\%modules)}; %ret = %new_ret if not defined $ret{"msg"}; } Modified: trunk/users/src/UsersPasswd.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPasswd.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersPasswd.pm (original) +++ trunk/users/src/UsersPasswd.pm Mon Jul 21 16:10:36 2008 @@ -145,14 +145,14 @@ return 0; } $shadow_tmp{$uname} = { - "shadowlastchange" => $last_change, - "shadowwarning" => $warn, - "shadowinactive" => $inact, - "shadowexpire" => $expire, - "shadowmin" => $min, - "shadowmax" => $max, - "shadowflag" => $flag, - "userpassword" => $pass + "shadowLastChange" => $last_change, + "shadowWarning" => $warn, + "shadowInactive" => $inact, + "shadowExpire" => $expire, + "shadowMin" => $min, + "shadowMax" => $max, + "shadowFlag" => $flag, + "userPassword" => $pass }; } else # plus line in /etc/shadow @@ -252,10 +252,10 @@ } $groups{$group_type}{$groupname} = { "cn" => $groupname, - "gidnumber" => $gid, + "gidNumber" => $gid, "userlist" => \%userlist, "type" => $group_type, - "userpassword" => $pass, + "userPassword" => $pass, "more_users" => {} }; @@ -410,14 +410,14 @@ $users{$user_type}{$username} = { "addit_data" => $additional, "cn" => $full, - "homedirectory" => $home, + "homeDirectory" => $home, "uid" => $username, - "uidnumber" => $uid, - "gidnumber" => $gid, - "loginshell" => $shell, + "uidNumber" => $uid, + "gidNumber" => $gid, + "loginShell" => $shell, "groupname" => $groupname, "grouplist" => \%grouplist, - "userpassword" => undef, + "userPassword" => undef, "type" => $user_type }; @@ -694,11 +694,11 @@ my $userline = join (":", ( $user{"uid"} || "", $pass, - $user{"uidnumber"} || 0, - $user{"gidnumber"} || 0, + $user{"uidNumber"} || 0, + $user{"gidNumber"} || 0, $cn, - $user{"homedirectory"} || "", - $user{"loginshell"} || "", + $user{"homeDirectory"} || "", + $user{"loginShell"} || "", )); if (defined $userline) { $out = $out."$userline\n"; @@ -750,7 +750,7 @@ foreach my $uname (sort keys %{$shadow_w{$type}}) { my %shadow_entry = %{$shadow_w{$type}{$uname}}; - foreach my $key ("shadowwarning", "shadowinactive", "shadowexpire", "shadowflag", "userpassword", "shadowmin", "shadowmax") { + foreach my $key ("shadowWarning", "shadowInactive", "shadowExpire", "shadowFlag", "userPassword", "shadowMin", "shadowMax") { # -1 should disable feature, it should not be written (#259896) if (!defined $shadow_entry{$key} || $shadow_entry{$key} eq -1) { $shadow_entry{$key} = ""; @@ -758,14 +758,14 @@ } my $shadowline = join (":", ( $uname, - $shadow_entry{"userpassword"}, - $shadow_entry{"shadowlastchange"}, - $shadow_entry{"shadowmin"}, - $shadow_entry{"shadowmax"}, - $shadow_entry{"shadowwarning"}, - $shadow_entry{"shadowinactive"}, - $shadow_entry{"shadowexpire"}, - $shadow_entry{"shadowflag"} + $shadow_entry{"userPassword"}, + $shadow_entry{"shadowLastChange"}, + $shadow_entry{"shadowMin"}, + $shadow_entry{"shadowMax"}, + $shadow_entry{"shadowWarning"}, + $shadow_entry{"shadowInactive"}, + $shadow_entry{"shadowExpire"}, + $shadow_entry{"shadowFlag"} )); if (defined $shadowline) { $out = $out."$shadowline\n"; @@ -819,13 +819,13 @@ my %group = %{$groups_w{$type}{$groupname}}; my $pass = "x"; - if (defined $group{"userpassword"}) { - $pass = $group{"userpassword"}; + if (defined $group{"userPassword"}) { + $pass = $group{"userPassword"}; } my @group_entry = ( $group{"cn"}, $pass, - $group{"gidnumber"} || 0, + $group{"gidNumber"} || 0, join (",", sort keys %{$group{"userlist"}}) ); my $groupline = join (":", @group_entry); Modified: trunk/users/src/UsersPluginLDAPAll.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPAll.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersPluginLDAPAll.pm (original) +++ trunk/users/src/UsersPluginLDAPAll.pm Mon Jul 21 16:10:36 2008 @@ -28,15 +28,15 @@ # default object classes of LDAP users my @user_object_class = - ("top","posixaccount", "inetorgperson"); + ("top","posixAccount", "inetOrgPerson"); # default object classes of LDAP groups my @group_object_class = - ( "top", "posixgroup", "groupofnames"); + ( "top", "posixGroup", "groupOfNames"); # object classes of LDAP groups using uniqmember attribute my @unique_group_object_class = - ( "top", "posixgroup", "groupofuniquenames"); + ( "top", "posixGroup", "groupOfUniqueNames"); # error message, returned when some plugin function fails my $error = ""; @@ -230,8 +230,8 @@ # attribute conversion my @required_attrs = (); my @object_classes = (); - if (defined $data->{"objectclass"} && ref ($data->{"objectclass"}) eq "ARRAY") { - @object_classes = @{$data->{"objectclass"}}; + if (defined $data->{"objectClass"} && ref ($data->{"objectClass"}) eq "ARRAY") { + @object_classes = @{$data->{"objectClass"}}; } # get the attributes required for entry's object classes @@ -248,8 +248,7 @@ my $action = $data->{"what"} || ""; # check the presence of required attributes foreach my $req (@required_attrs) { - my $attr = lc ($req); - my $val = $data->{$attr}; + my $val = $data->{$req}; if (substr ($action, 0, 5) eq "edit_" && !defined $val) { # when editing using YaPI, attribute dosn't have to be loaded next; @@ -259,7 +258,7 @@ ((@{$val} == 0) || (@{$val} == 1 && $val->[0] eq "")))) { # error popup (user forgot to fill in some attributes) return sprintf (__("The attribute '%s' is required for this object according -to its LDAP configuration, but it is currently empty."), $attr); +to its LDAP configuration, but it is currently empty."), $req); } } return ""; @@ -315,9 +314,9 @@ # define the object class for new user/groupa my @orig_object_class = (); - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - @orig_object_class = @{$data->{"objectclass"}}; + @orig_object_class = @{$data->{"objectClass"}}; } my @ocs = @user_object_class; if (($config->{"what"} || "") eq "group") { @@ -334,7 +333,7 @@ } } - $data->{"objectclass"} = \@orig_object_class; + $data->{"objectClass"} = \@orig_object_class; return $data; } Modified: trunk/users/src/UsersPluginLDAPPasswordPolicy.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPPasswordPolicy.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersPluginLDAPPasswordPolicy.pm (original) +++ trunk/users/src/UsersPluginLDAPPasswordPolicy.pm Mon Jul 21 16:10:36 2008 @@ -75,8 +75,8 @@ my ($config, $data) = @_; my @updated_oc; - if (defined $data->{'pwdpolicysubentry'}) { - $data->{'pwdpolicysubentry'} = ""; + if (defined $data->{'pwdPolicySubEntry'}) { + $data->{'pwdPolicySubEntry'} = ""; } return $data; } @@ -152,8 +152,10 @@ }); y2milestone ("Password Policy enabled globaly: $ppolicy_enabled"); } - if (contains ($data->{'plugins'}, $name, 1) || # already checked, still no data - contains ((keys %$data), "pwdpolicysubentry", 1)) { # checking for data + if (contains ($data->{'plugins'}, $name, 1) || + # already checked, still no data + contains ((keys %$data), "pwdPolicySubEntry", 1)) # checking for data + { y2milestone ("LDAPPasswordPolicy plugin present"); return 1; } elsif ($ppolicy_enabled) { @@ -208,7 +210,7 @@ sub Check { my ($self, $config, $data) = @_; - my $pwdpolicysubentry = $data->{'pwdpolicysubentry'}; + my $pwdpolicysubentry = $data->{'pwdPolicySubEntry'}; if (defined $pwdpolicysubentry && $pwdpolicysubentry ne "") { # validate DN @@ -220,7 +222,7 @@ # ldap.init has been done before my $search = SCR->Read (".ldap.search", { "base_dn" => $pwdpolicysubentry, - "attrs" => [ "objectclass" ], + "attrs" => [ "objectClass" ], "map" => 1 }); if (not defined $search) { @@ -229,9 +231,9 @@ return sprintf (__("Error while searching for \"%s\": %s"), $pwdpolicysubentry, $error->{'msg'}); } - my $oc = $search->{$pwdpolicysubentry}{'objectclass'}; + my $oc = $search->{$pwdpolicysubentry}{'objectClass'}; if (defined $oc && ref ($oc) eq "ARRAY") { - if (not contains ($oc, "pwdpolicy", 1)) { + if (not contains ($oc, "pwdPolicy", 1)) { # error popup, %s is object DN return sprintf (__("The object \"%s\" is not a Password Policy object"), $pwdpolicysubentry); @@ -251,7 +253,7 @@ my ($self, $config, $data) = @_; y2debug ("Enable LDAPAll called"); - $data->{'pwdaccountlockedtime'} = ""; + $data->{'pwdAccountLockedTime'} = ""; return $data; } @@ -265,7 +267,7 @@ my ($self, $config, $data) = @_; y2debug ("Disable LDAPAll called"); - $data->{'pwdaccountlockedtime'} = $disabled_user; + $data->{'pwdAccountLockedTime'} = $disabled_user; return $data; } @@ -331,7 +333,8 @@ } if (!defined $config->{"org_data"}{"enabled"}) { $data->{"enabled"} = YaST::YCP::Boolean (1); - if (($config->{"org_data"}{"pwdaccountlockedtime"} || "") eq $disabled_user) { + if (($config->{"org_data"}{"pwdAccountLockedTime"} || "") eq $disabled_user) + { $data->{"enabled"} = YaST::YCP::Boolean (0); y2milestone ("user is disabled"); } Modified: trunk/users/src/UsersPluginLDAPShadowAccount.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersPluginLDAPShadowAccount.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersPluginLDAPShadowAccount.pm (original) +++ trunk/users/src/UsersPluginLDAPShadowAccount.pm Mon Jul 21 16:10:36 2008 @@ -30,7 +30,7 @@ ##--------------------- global variables # object classes handled by this plugin -my $user_object_class = "shadowaccount"; +my $user_object_class = "shadowAccount"; # conflicting plugin name my $pwdpolicy_plugin = "UsersPluginLDAPPasswordPolicy"; @@ -77,12 +77,12 @@ my ($config, $data) = @_; - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - my @orig_object_class = @{$data->{"objectclass"}}; + my @orig_object_class = @{$data->{"objectClass"}}; if (!contains (\@orig_object_class, $user_object_class, 1)) { push @orig_object_class, $user_object_class; - $data->{"objectclass"} = \@orig_object_class; + $data->{"objectClass"} = \@orig_object_class; } # set default values for new variables my $shadow = UsersLDAP->GetDefaultShadow (); @@ -91,8 +91,8 @@ $data->{$attr} = $shadow->{$attr}; } } - if (!defined $data->{"shadowlastchange"}) { - $data->{"shadowlastchange"} = last_change_is_now (); + if (!defined $data->{"shadowLastChange"}) { + $data->{"shadowLastChange"} = last_change_is_now (); } } return $data; @@ -103,14 +103,14 @@ my ($config, $data) = @_; my @updated_oc; - foreach my $oc (@{$data->{'objectclass'}}) { - if (lc($oc) ne $user_object_class) { + foreach my $oc (@{$data->{"objectClass"}}) { + if (lc($oc) ne lc ($user_object_class)) { push @updated_oc, $oc; } } - $data->{'objectclass'} = \@updated_oc; - foreach my $attr ("shadowinactive", "shadowexpire", "shadowlastchange", - "shadowmin", "shadowmax", "shadowwarning", "shadowflag") + $data->{"objectClass"} = \@updated_oc; + foreach my $attr ("shadowInactive", "shadowExpire", "shadowLastChange", + "shadowMin", "shadowMax", "shadowWarning", "shadowFlag") { $data->{$attr} = ""; } @@ -180,7 +180,7 @@ my ($self, $config, $data) = @_; - if (contains ($data->{'objectclass'}, $user_object_class, 1)) { + if (contains ($data->{"objectClass"}, $user_object_class, 1)) { y2milestone ("LDAPShadowAccount plugin present"); return 1; } else { @@ -236,9 +236,9 @@ # attribute conversion my @required_attrs = (); my @object_classes = (); - if (defined $data->{"objectclass"} && ref $data->{"objectclass"} eq "ARRAY") + if (defined $data->{"objectClass"} && ref $data->{"objectClass"} eq "ARRAY") { - @object_classes = @{$data->{"objectclass"}}; + @object_classes = @{$data->{"objectClass"}}; } # get the attributes required for entry's object classes @@ -255,8 +255,7 @@ my $action = $data->{"what"} || ""; # check the presence of required attributes foreach my $req (@required_attrs) { - my $attr = lc ($req); - my $val = $data->{$attr}; + my $val = $data->{$req}; if (substr ($action, 0, 5) eq "edit_" && !defined $val) { # when editing using YaPI, attribute dosn't have to be loaded next; @@ -266,7 +265,7 @@ ((@{$val} == 0) || (@{$val} == 1 && $val->[0] eq "")))) { # error popup (user forgot to fill in some attributes) return sprintf (__("The attribute '%s' is required for this object according -to its LDAP configuration, but it is currently empty."), $attr); +to its LDAP configuration, but it is currently empty."), $req); } } return ""; @@ -280,20 +279,20 @@ sub Enable { my ($self, $config, $data) = @_; - my $pw = $data->{"userpassword"}; + my $pw = $data->{"userPassword"}; if ((defined $pw) && $pw =~ m/^\!/) { $pw =~ s/^\!//; - $data->{"userpassword"} = $pw; + $data->{"userPassword"} = $pw; } - $data->{"shadowexpire"} = ""; + $data->{"shadowExpire"} = ""; y2debug ("Enable LDAPAll called"); return $data; } # this will be called from Users::DisableUser # set "shadowExpire" to "0", -# set a "!" before the hash-value in the "userpassword" +# set a "!" before the hash-value in the "userPassword" BEGIN { $TYPEINFO{Disable} = ["function", ["map", "string", "any"], "any", "any"]; @@ -302,12 +301,12 @@ my ($self, $config, $data) = @_; - my $pw = $data->{"userpassword"}; + my $pw = $data->{"userPassword"}; if ((defined $pw) && $pw !~ m/^\!/) { - $data->{"userpassword"} = "!".$pw; + $data->{"userPassword"} = "!".$pw; } - $data->{"shadowexpire"} = 0; + $data->{"shadowExpire"} = 0; y2debug ("Disable LDAPAll called"); return $data; } Modified: trunk/users/src/UsersRoutines.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersRoutines.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersRoutines.pm (original) +++ trunk/users/src/UsersRoutines.pm Mon Jul 21 16:10:36 2008 @@ -294,10 +294,10 @@ my $user = shift; my $username = $user->{"uid"} || ""; - my $home = $user->{"homedirectory"} || ""; + my $home = $user->{"homeDirectory"} || ""; my $home_size = $user->{"crypted_home_size"} || 0; my $org_size = $user->{"org_user"}{"crypted_home_size"} || 0; - my $org_home = $user->{"org_user"}{"homedirectory"} || $home; + my $org_home = $user->{"org_user"}{"homeDirectory"} || $home; my $org_username = $user->{"org_user"}{"uid"} || $username; my $pw = $user->{"current_text_userpassword"}; my $new_pw = $user->{"text_userpassword"}; Modified: trunk/users/src/UsersSimple.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersSimple.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/UsersSimple.pm (original) +++ trunk/users/src/UsersSimple.pm Mon Jul 21 16:10:36 2008 @@ -724,7 +724,7 @@ sub CheckPasswordUI { my ($self, $data, $ui_map) = @_; - my $pw = $data->{"userpassword"} || ""; + my $pw = $data->{"userPassword"} || ""; my $name = $data->{"uid"}; $name = ($data->{"cn"} || "") if (!defined $name); my $type = $data->{"type"} || "local"; @@ -875,10 +875,10 @@ my $self = shift; my $user_defined = 0; foreach my $user (@users) { - if (defined $user->{"userpassword"}) { + if (defined $user->{"userPassword"}) { if (!defined $user->{"__imported"}) { - $user->{"userpassword"} = - $self->CryptPassword($user->{"userpassword"}); + $user->{"userPassword"} = + $self->CryptPassword($user->{"userPassword"}); } $user->{"encrypted"} = YaST::YCP::Integer (1); } @@ -1021,14 +1021,14 @@ return undef; } $shadow_tmp{$uname} = { - "shadowlastchange" => $last_change, - "shadowwarning" => $warn, - "shadowinactive" => $inact, - "shadowexpire" => $expire, - "shadowmin" => $min, - "shadowmax" => $max, - "shadowflag" => $flag, - "userpassword" => $pass + "shadowLastChange" => $last_change, + "shadowWarning" => $warn, + "shadowInactive" => $inact, + "shadowExpire" => $expire, + "shadowMin" => $min, + "shadowMax" => $max, + "shadowFlag" => $flag, + "userPassword" => $pass }; } } @@ -1102,11 +1102,11 @@ $imported_users{$user_type}{$username} = { "addit_data" => $additional, "cn" => $full, - "homedirectory" => $home, + "homeDirectory" => $home, "uid" => $username, - "uidnumber" => $uid, - "gidnumber" => $gid, - "loginshell" => $shell, + "uidNumber" => $uid, + "gidNumber" => $gid, + "loginShell" => $shell, }; if (defined $shadow_tmp->{$username}) { # divide shadow map accoring to user type Modified: trunk/users/src/YaPI/USERS.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/YaPI/USERS.pm?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/YaPI/USERS.pm (original) +++ trunk/users/src/YaPI/USERS.pm Mon Jul 21 16:10:36 2008 @@ -167,7 +167,7 @@ UsersLDAP->SetCurrentUserFilter (UsersLDAP->GetDefaultUserFilter ()); } - # this could replace the settings saved in LDAP config ("susedefaultbase") + # this could replace the settings saved in LDAP config ("suseDefaultBase") if (defined $config->{"user_base"}) { UsersLDAP->SetUserBase ($config->{"user_base"}); } @@ -236,7 +236,7 @@ my $more = shift; my @necessary = - ("uid", "uidnumber", "objectclass", UsersLDAP->GetUserNamingAttr ()); + ("uid", "uidNumber", "objectClass", UsersLDAP->GetUserNamingAttr ()); my $current = UsersLDAP->GetUserAttributes (); my %attributes = (); foreach my $a (@$current) { @@ -258,7 +258,7 @@ my $more = shift; my @necessary = - ("cn", "gidnumber", "objectclass", UsersLDAP->GetGroupNamingAttr ()); + ("cn", "gidNumber", "objectClass", UsersLDAP->GetGroupNamingAttr ()); my $current = UsersLDAP->GetGroupAttributes (); my %attributes = (); foreach my $a (@$current) { @@ -320,12 +320,12 @@ "user_filter" Filter for restricting LDAP searches (string). - The default value is stored as "susesearchfilter" in + The default value is stored as "suseSearchFilter" in LDAP configuration. "user_base" DN of LDAP base where the users are stored (string). By - default, the value of "susedefaultbase" stored in LDAP + default, the value of "suseDefaultBase" stored in LDAP configuration is used. "user_scope" @@ -356,10 +356,10 @@ "uid" Login name "cn" Full name - "userpassword" User's password - "homedirectory" Users's home directory - "loginshell" User's login shell - "gidnumber" GID of user's default group + "userPassword" User's password + "homeDirectory" Users's home directory + "loginShell" User's login shell + "gidNumber" GID of user's default group "grouplist" Hash (of type { => 1 }) with groups this user should be member of. "shadowinactive" Days after password expires that account is disabled @@ -381,8 +381,8 @@ "bind_dn" => "uid=admin,dc=example,dc=com", }; my $data = { "uid" => "ll", - "uidnumber" => 1111, - "userpassword" => "qqqqq" + "uidNumber" => 1111, + "userPassword" => "qqqqq" "givenName" => "l", "cn" => [ "ll" ] "description" => [ "first", "second" ], @@ -418,11 +418,11 @@ # this translation table should not be neccessary... my $new_keys = { "username" => "uid", - "password" => "userpassword", - "home" => "homedirectory", - "shell" => "loginshell", + "password" => "userPassword", + "home" => "homeDirectory", + "shell" => "loginShell", "fullname" => "cn", - "gid" => "gidnumber", + "gid" => "gidNumber", "groups" => "grouplist" }; if (defined $config->{"create_home"} && !defined $data->{"create_home"}) { @@ -461,11 +461,11 @@ # now rewrite default values (read from LDAP) with given values InitializeUsersLdapConfiguration ($config); - SetNecessaryUserAttributes (["homedirectory"]); + SetNecessaryUserAttributes (["homeDirectory"]); # read only users ID's (because we need to create new one -> TODO # update UsersCache->NextFreeUID) if (defined $config->{"fast_ldap"}) { - UsersLDAP->SetUserAttributes (["uidnumber"]); + UsersLDAP->SetUserAttributes (["uidNumber"]); } # finally read LDAP tree $ret = Users->ReadLDAPSet (); @@ -489,7 +489,7 @@ # EXPERIMENTAL MODE: do not read LDAP users before adding, but check # possible conflicts with multiple search calls if ($type eq "ldap" && defined $config->{"fast_ldap"}) { - # do the searches for uid and homedirectory + # do the searches for uid and homeDirectory $user = Users->GetCurrentUser (); my $res = SCR->Read (".ldap.search", { "base_dn" => UsersLDAP->GetUserBase (), @@ -506,8 +506,8 @@ $res = SCR->Read (".ldap.search", { "base_dn" => UsersLDAP->GetUserBase (), "scope" => YaST::YCP::Integer (2), - "filter" => "homedirectory=".$user->{"homedirectory"}, - "attrs" => [ "homedirectory" ] + "filter" => "homeDirectory=".$user->{"homeDirectory"}, + "attrs" => [ "homeDirectory" ] }); if (defined $res && ref ($res) eq "ARRAY" && @{$res} > 0) { # error message @@ -539,7 +539,7 @@ "dn" Distinguished name (DN) - only for LDAP user "uid" User name (which is value of "uid" for LDAP user) - "uidnumber" UID number ("uidnumber" value for LDAP user) + "uidNumber" UID number ("uidNumber" value for LDAP user) For values in $data hash, see L<UserAdd>. @@ -547,15 +547,15 @@ EXAMPLE: my $config = { "type" => "ldap", - "uidnumber" => 500 + "uidNumber" => 500 }; - my $data = { "userpassword" => "wwwww" + my $data = { "userPassword" => "wwwww" }; # changes a password of LDAP user (identified with id) my $error = UserModify ($config, $data); # change GID value of local user (identified with name) - $error = UserModify ({ "uid" => "hh" }, { "gidnumber" => 5555 }); + $error = UserModify ({ "uid" => "hh" }, { "gidNumber" => 5555 }); =cut @@ -589,8 +589,8 @@ elsif (defined $config->{"uid"}) { $key = "uid"; } - elsif (defined $config->{"uidnumber"}) { - $key = "uidnumber"; + elsif (defined $config->{"uidNumber"}) { + $key = "uidNumber"; } if ($type eq "ldap") { @@ -603,14 +603,14 @@ InitializeUsersLdapConfiguration ($config); # If we want to change atributes, that should be unique - # (uid/dn/uidnumber/home we must read everything to check + # (uid/dn/uidNumber/home we must read everything to check # possible conflicts... my $read_all = 0; - if (defined $data->{"uid"} || defined $data->{"uidnumber"}) { + if (defined $data->{"uid"} || defined $data->{"uidNumber"}) { $read_all = 1; } - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn" && !$read_all) { UsersLDAP->SetUserBase ($config->{$key}); @@ -620,9 +620,9 @@ UsersLDAP->AddToCurrentUserFilter ($filter); } # Let's create the minimal list of neccessary attributes to get - if (defined $data->{"homedirectory"}) { + if (defined $data->{"homeDirectory"}) { # we must check possible directory conflicts... - SetNecessaryUserAttributes (["homedirectory"]); + SetNecessaryUserAttributes (["homeDirectory"]); } else { SetNecessaryUserAttributes ([]); @@ -634,7 +634,7 @@ elsif ($type eq "nis") { Users->ReadNewSet ($type); } - if ($key eq "uidnumber") { + if ($key eq "uidNumber") { Users->SelectUser ($config->{$key}, $type); } elsif ($key ne "") { @@ -722,8 +722,8 @@ elsif (defined $config->{"uid"}) { $key = "uid"; } - elsif (defined $config->{"uidnumber"}) { - $key = "uidnumber"; + elsif (defined $config->{"uidNumber"}) { + $key = "uidNumber"; } if ($type eq "ldap") { @@ -735,7 +735,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetUserBase ($config->{$key}); @@ -758,7 +758,7 @@ return __("It is not possible to edit a NIS user."); } - if ($key eq "uidnumber") { + if ($key eq "uidNumber") { Users->SelectUser ($config->{$key}, $type); } elsif ($key ne "") { @@ -839,8 +839,8 @@ elsif (defined $config->{"uid"}) { $key = "uid"; } - elsif (defined $config->{"uidnumber"}) { - $key = "uidnumber"; + elsif (defined $config->{"uidNumber"}) { + $key = "uidNumber"; } if ($type eq "ldap") { @@ -852,7 +852,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetUserBase ($config->{$key}); @@ -875,7 +875,7 @@ return __("It is not possible to edit a NIS user."); } - if ($key eq "uidnumber") { + if ($key eq "uidNumber") { Users->SelectUser ($config->{$key}, $type); } elsif ($key ne "") { @@ -957,8 +957,8 @@ elsif (defined $config->{"uid"}) { $key = "uid"; } - elsif (defined $config->{"uidnumber"}) { - $key = "uidnumber"; + elsif (defined $config->{"uidNumber"}) { + $key = "uidNumber"; } if ($type eq "ldap") { @@ -970,7 +970,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetUserBase ($config->{$key}); @@ -988,7 +988,7 @@ return __("It is not possible to delete a NIS user."); } - if ($key eq "uidnumber") { + if ($key eq "uidNumber") { Users->SelectUser ($config->{$key}, $type); } elsif ($key ne "") { @@ -1027,7 +1027,7 @@ EXAMPLE: my $config = { "type" => "ldap", - "uidnumber" => 500, + "uidNumber" => 500, }; # disables LDAP user (as it is defined its plugins) my $error = UserDisable ($config); @@ -1048,8 +1048,8 @@ ref ($config->{"user_attributes"}) eq "ARRAY") { @attributes = @{$config->{"user_attributes"}}; } - if (! grep /^userpassword$/i, @attributes) { - push @attributes, "userpassword"; + if (! grep /^userPassword$/i, @attributes) { + push @attributes, "userPassword"; } $config->{"user_attributes"} = \@attributes; @@ -1074,7 +1074,7 @@ EXAMPLE: my $config = { "type" => "ldap", - "uidnumber" => 500, + "uidNumber" => 500, }; # enables LDAP user (in a default way, defined for LDAP users) my $error = UserEnable ($config); @@ -1095,8 +1095,8 @@ ref ($config->{"user_attributes"}) eq "ARRAY") { @attributes = @{$config->{"user_attributes"}}; } - if (! grep /^userpassword$/i, @attributes) { - push @attributes, "userpassword"; + if (! grep /^userPassword$/i, @attributes) { + push @attributes, "userPassword"; } $config->{"user_attributes"} = \@attributes; @@ -1118,10 +1118,10 @@ EXAMPLE: my $config = { "type" => "ldap", - "user_attributes" => [ "uid", "uidnumber", "cn" ], - "uidnumber" => 500 + "user_attributes" => [ "uid", "uidNumber", "cn" ], + "uidNumber" => 500 }; - # searches for LDAP user with uidnumber 500 and returns the hash with given + # searches for LDAP user with uidNumber 500 and returns the hash with given # attributes my $user = UserGet ($config); @@ -1163,8 +1163,8 @@ elsif (defined $config->{"uid"}) { $key = "uid"; } - elsif (defined $config->{"uidnumber"}) { - $key = "uidnumber"; + elsif (defined $config->{"uidNumber"}) { + $key = "uidNumber"; } if ($type eq "ldap") { @@ -1176,7 +1176,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetUserBase ($config->{$key}); @@ -1193,7 +1193,7 @@ Users->ReadNewSet ($type); } - if ($key eq "uidnumber") { + if ($key eq "uidNumber") { $ret = Users->GetUser ($config->{$key}, $type); } elsif ($key ne "") { @@ -1234,10 +1234,10 @@ EXAMPLE: my $config = { "type" => "ldap", - "user_attributes" => [ "uid", "uidnumber", "cn" ], + "user_attributes" => [ "uid", "uidNumber", "cn" ], "user_base" => "ou=people,dc=example,dc=com", "user_scope" => YaST::YCP::Integer (2), - "user_filter" => [ "objectclass=posixAccount" ] + "user_filter" => [ "objectClass=posixAccount" ] "index" => "dn" }; # searches for LDAP users in given search base and returns the hash @@ -1281,7 +1281,7 @@ Users->ReadNewSet ($type); } - my $index = $config->{"index"} || "uidnumber"; + my $index = $config->{"index"} || "uidNumber"; return Users->GetUsers ($index, $type); } @@ -1334,12 +1334,12 @@ "group_base" DN of LDAP base where the groups are stored (string). By - default, the value of "susedefaultbase" stored in LDAP + default, the value of "suseDefaultBase" stored in LDAP configuration is used. "group_filter" Filter for restricting LDAP searches (string). - The default value is stored as "susesearchfilter" in + The default value is stored as "suseSearchFilter" in LDAP configuration. "group_scope" @@ -1358,9 +1358,9 @@ Possible parameters for $data hash: - "gidnumber" GID number of the group + "gidNumber" GID number of the group "cn" Group name - "userpassword" Password for the group. + "userPassword" Password for the group. "userlist" Hash (of type { <username> => 1 }) with the users that should be members of this group. Optionally, this could be also the list of @@ -1382,7 +1382,7 @@ "bind_dn" => "uid=admin,dc=example,dc=com", "group_base" => "ou=groups,dc=example,dc=com" }; - my $data = { "gidnumber" => 5555, + my $data = { "gidNumber" => 5555, "cn" => "lgroup", "member" => { "uid=test,ou=people,dc=example,dc=com" => 1, @@ -1498,16 +1498,16 @@ "dn" Distingueshed name (only for of LDAP group) "cn" Group name (or value of "cn" attribute for LDAP group). - "gidnumber" GID number (value of "gidnumber" for LDAP group). + "gidNumber" GID number (value of "gidNumber" for LDAP group). EXAMPLE # change GID value of local group (identified with name) - my $error = GroupModify ({ "cn" => "users" }, { "gidnumber" => 101 }); + my $error = GroupModify ({ "cn" => "users" }, { "gidNumber" => 101 }); my $config = { "type" => "ldap", - "gidnumber" => 5555 + "gidNumber" => 5555 }; my $data = { "member" => [ "uid=test,ou=people,dc=example,dc=com", @@ -1556,8 +1556,8 @@ elsif (defined $config->{"cn"}) { $key = "cn"; } - elsif (defined $config->{"gidnumber"}) { - $key = "gidnumber"; + elsif (defined $config->{"gidNumber"}) { + $key = "gidNumber"; } # convert 'member' from list to hash if necessary @@ -1583,15 +1583,15 @@ InitializeUsersLdapConfiguration ($config); # If we want to atributes, that should be unique - # (cn/dn/gidnumber/memebr we must read everything to check + # (cn/dn/gidNumber/memebr we must read everything to check # possible conflicts... my $read_all = 0; - if (defined $data->{"cn"} || defined $data->{"gidnumber"} || + if (defined $data->{"cn"} || defined $data->{"gidNumber"} || defined $data->{$member_attr}) { $read_all = 1; } - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn" && !$read_all) { UsersLDAP->SetGroupBase ($config->{$key}); @@ -1606,12 +1606,12 @@ # ----------------------------------------------------- # let's limit also user data which we need to read - # (gidnumber is changed) <-> (user modification necessary) - if (!defined $data->{"gidnumber"}) { + # (gidNumber is changed) <-> (user modification necessary) + if (!defined $data->{"gidNumber"}) { # -> so we don't need to read any user now... UsersLDAP->SetCurrentUserFilter ("0=1"); } - SetNecessaryUserAttributes (["gidnumber"]); + SetNecessaryUserAttributes (["gidNumber"]); # ---------- $error = Users->ReadLDAPSet (); @@ -1622,7 +1622,7 @@ return __("It is not possible to modify a NIS group."); } - if ($key eq "gidnumber") { + if ($key eq "gidNumber") { Users->SelectGroup ($config->{$key}, $type); } elsif ($key ne "") { @@ -1664,14 +1664,14 @@ "dn" Distinguished name (DN) [only for LDAP users] "uid" User name (which is "uid" attribute for LDAP user) - "uidnumber" UID (which is "uidnumber" attribute for LDAP user) + "uidNumber" UID (which is "uidNumber" attribute for LDAP user) EXAMPLE: my $config = { "type" => "ldap", "bind_dn" => "uid=admin,dc=example,dc=com", - "gidnumber" => 5555 + "gidNumber" => 5555 }; my $user = { "uid" => "my_user" } }; @@ -1712,8 +1712,8 @@ elsif (defined $config->{"cn"}) { $key = "cn"; } - elsif (defined $config->{"gidnumber"}) { - $key = "gidnumber"; + elsif (defined $config->{"gidNumber"}) { + $key = "gidNumber"; } if ($type eq "ldap") { @@ -1725,7 +1725,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetGroupBase ($config->{$key}); @@ -1755,7 +1755,7 @@ return __("It is not possible to modify a NIS group."); } - if ($key eq "gidnumber") { + if ($key eq "gidNumber") { Users->SelectGroup ($config->{$key}, $type); } elsif ($key eq "cn") { @@ -1779,13 +1779,13 @@ if (defined $user->{"uid"}) { $usermap = Users->GetUserByName ($user->{"uid"}, $type); } - elsif (defined $user->{"uidnumber"}) { - $usermap = Users->GetUser ($user->{"uidnumber"}, $type); + elsif (defined $user->{"uidNumber"}) { + $usermap = Users->GetUser ($user->{"uidNumber"}, $type); } if ($type eq "ldap") { $user_id = $usermap->{"dn"}; # TODO maybe there is ony one user loaded, but not specified by - # uid/uidnumber/dn... ->GetUserByAttribute... + # uid/uidNumber/dn... ->GetUserByAttribute... } else { $user_id = $usermap->{"uid"}; @@ -1835,9 +1835,9 @@ my $config = { "type" => "ldap", "dn" => "cn=lgroup,dc=example,dc=com" }; - my $user = { "uidnumber" => 1000 } + my $user = { "uidNumber" => 1000 } - # removes user with given uidnumber from group with given DN + # removes user with given uidNumber from group with given DN my $error = GroupMemberDelete ($config, $user); =cut @@ -1875,8 +1875,8 @@ elsif (defined $config->{"cn"}) { $key = "cn"; } - elsif (defined $config->{"gidnumber"}) { - $key = "gidnumber"; + elsif (defined $config->{"gidNumber"}) { + $key = "gidNumber"; } if ($type eq "ldap") { @@ -1888,7 +1888,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetGroupBase ($config->{$key}); @@ -1918,7 +1918,7 @@ return __("It is not possible to modify a NIS group."); } - if ($key eq "gidnumber") { + if ($key eq "gidNumber") { Users->SelectGroup ($config->{$key}, $type); } elsif ($key eq "cn") { @@ -1942,13 +1942,13 @@ if (defined $user->{"uid"}) { $usermap = Users->GetUserByName ($user->{"uid"}, $type); } - elsif (defined $user->{"uidnumber"}) { - $usermap = Users->GetUser ($user->{"uidnumber"}, $type); + elsif (defined $user->{"uidNumber"}) { + $usermap = Users->GetUser ($user->{"uidNumber"}, $type); } if ($type eq "ldap") { $user_id = $usermap->{"dn"}; # TODO maybe there is ony one user loaded, but not specified by - # uid/uidnumber/dn... ->GetUserByAttribute... + # uid/uidNumber/dn... ->GetUserByAttribute... } else { $user_id = $usermap->{"uid"}; @@ -2031,8 +2031,8 @@ elsif (defined $config->{"cn"}) { $key = "cn"; } - elsif (defined $config->{"gidnumber"}) { - $key = "gidnumber"; + elsif (defined $config->{"gidNumber"}) { + $key = "gidNumber"; } if ($type eq "ldap") { @@ -2044,7 +2044,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetGroupBase ($config->{$key}); @@ -2056,12 +2056,12 @@ # we must read users to check if group is not default group for someone # read only users 'affected' by our group number - if (defined $config->{"gidnumber"}) { - my $filter = "gidnumber=".$config->{"gidnumber"}; + if (defined $config->{"gidNumber"}) { + my $filter = "gidNumber=".$config->{"gidNumber"}; UsersLDAP->AddToCurrentUserFilter ($filter); - # TODO read gidnumber by ldapsearch if not given + # TODO read gidNumber by ldapsearch if not given } - SetNecessaryUserAttributes (["gidnumber"]); + SetNecessaryUserAttributes (["gidNumber"]); $error = Users->ReadLDAPSet (); if ($error ne "") { return $error; } @@ -2071,7 +2071,7 @@ return __("It is not possible to delete a NIS group."); } - if ($key eq "gidnumber") { + if ($key eq "gidNumber") { Users->SelectGroup ($config->{$key}, $type); } elsif ($key eq "cn") { @@ -2113,10 +2113,10 @@ EXAMPLE: my $config = { "type" => "ldap", - "group_attributes" => [ "cn", "gidnumber", "member" ], - "gidnumber" => 500 + "group_attributes" => [ "cn", "gidNumber", "member" ], + "gidNumber" => 500 }; - # searches for LDAP group with gidnumber 500 and returns the hash + # searches for LDAP group with gidNumber 500 and returns the hash # with given attributes my $group = GroupGet ($config); @@ -2148,8 +2148,8 @@ elsif (defined $config->{"cn"}) { $key = "cn"; } - elsif (defined $config->{"gidnumber"}) { - $key = "gidnumber"; + elsif (defined $config->{"gidNumber"}) { + $key = "gidNumber"; } if ($type eq "ldap") { @@ -2161,7 +2161,7 @@ if ($error ne "") { return $error; } InitializeUsersLdapConfiguration ($config); - # search with proper filter (= one DN/uid/uidnumber) + # search with proper filter (= one DN/uid/uidNumber) # should be sufficient in this case... if ($key eq "dn") { UsersLDAP->SetGroupBase ($config->{$key}); @@ -2171,16 +2171,16 @@ UsersLDAP->AddToCurrentGroupFilter ($filter); } # read only users 'affected' by our group number - if (defined $config->{"gidnumber"}) { - my $filter = "gidnumber=".$config->{"gidnumber"}; + if (defined $config->{"gidNumber"}) { + my $filter = "gidNumber=".$config->{"gidNumber"}; UsersLDAP->AddToCurrentUserFilter ($filter); - # TODO read gidnumber by ldapsearch if not given + # TODO read gidNumber by ldapsearch if not given } else { # we don't need any users -> fake filter for faster searching UsersLDAP->SetCurrentUserFilter ("0=1"); } - SetNecessaryUserAttributes (["gidnumber"]); + SetNecessaryUserAttributes (["gidNumber"]); $error = Users->ReadLDAPSet (); if ($error ne "") { return $ret; } @@ -2189,7 +2189,7 @@ Users->ReadNewSet ($type); } - if ($key eq "gidnumber") { + if ($key eq "gidNumber") { $ret = Users->GetGroup ($config->{$key}, $type); } elsif ($key eq "cn") { @@ -2227,7 +2227,7 @@ Additionally, there is a special key "index" The name of the key, which should be used as a index - in the return hash (default value is "gidnumber"). + in the return hash (default value is "gidNumber"). EXAMPLE: @@ -2284,7 +2284,7 @@ Users->ReadNewSet ($type); } - my $index = $config->{"index"} || "gidnumber"; + my $index = $config->{"index"} || "gidNumber"; return Users->GetGroups ($index, $type); } @@ -2404,12 +2404,12 @@ } # index to search the output - my $index = $config->{"index"} || "gidnumber"; + my $index = $config->{"index"} || "gidNumber"; if ($type ne "ldap") { # get the specified user - if (!defined $user->{"uid"} && !defined $user->{"uidnumber"}) { + if (!defined $user->{"uid"} && !defined $user->{"uidNumber"}) { # error message my $error = __("User was not correctly specified."); y2warning ($error); @@ -2422,7 +2422,7 @@ $usermap = Users->GetUserByName ($user->{"uid"}, $user_type); } else { - $usermap = Users->GetUser ($user->{"uidnumber"}, $user_type); + $usermap = Users->GetUser ($user->{"uidNumber"}, $user_type); } if (!defined $usermap || ref ($usermap) ne "HASH" || !%{$usermap}) { # error message Modified: trunk/users/src/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/cmdline.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/cmdline.ycp (original) +++ trunk/users/src/cmdline.ycp Mon Jul 21 16:10:36 2008 @@ -61,25 +61,25 @@ map ret = $[]; map keys = $[ "username" : "uid", - "password" : "userpassword", - "home" : "homedirectory", - "shell" : "loginshell", + "password" : "userPassword", + "home" : "homeDirectory", + "shell" : "loginShell", "fullname" : "cn", - "gid" : "gidnumber", - "uid" : "uidnumber", + "gid" : "gidNumber", + "uid" : "uidNumber", "no_home" : "create_home", "groupname" : "cn", "new_username" : "uid", "new_groupname" : "cn", - "new_uid" : "uidnumber", - "new_gid" : "gidnumber", + "new_uid" : "uidNumber", + "new_gid" : "gidNumber", UsersLDAP::GetMemberAttribute (): "userlist", ]; foreach (string key, any value, input, ``{ string new_key = keys[key]:key; if (new_key == "create_home") value = false; - if (new_key == "gidnumber" && value != "" && + if (new_key == "gidNumber" && value != "" && (haskey (input,"username") || haskey (input,"uid"))) { // check group existence! @@ -174,7 +174,7 @@ define boolean UserShowHandler (map options ) ``{ map user = $[]; - integer uid = tointeger (options ["uidnumber"]:options["uid"]:"-1"); + integer uid = tointeger (options ["uidNumber"]:options["uid"]:"-1"); string username = options ["username"]:""; string type = options ["type"]:"local"; @@ -211,11 +211,11 @@ // label shown at command line (user attribute) "uid" : _("Login Name:"), // label shown at command line (user attribute) - "homedirectory" : _("Home Directory:"), + "homeDirectory" : _("Home Directory:"), // label shown at command line (user attribute) - "loginshell" : _("Login Shell:"), + "loginShell" : _("Login Shell:"), // label shown at command line (user attribute) - "uidnumber" : _("UID:"), + "uidNumber" : _("UID:"), // label shown at command line (user attribute) "groupname" : _("Default Group:"), // label shown at command line (user attribute) @@ -261,7 +261,7 @@ Users::ResetCurrentUser (); - if (!haskey(user,"userpassword")) + if (!haskey(user,"userPassword")) { string pw = ""; integer i = 0; @@ -289,9 +289,9 @@ } else break; } - user["userpassword"] = pw; + user["userPassword"] = pw; } - string error = UsersSimple::CheckPassword (user["userpassword"]:"", type); + string error = UsersSimple::CheckPassword (user["userPassword"]:"", type); if (error != "") { @@ -328,7 +328,7 @@ */ define boolean UserDeleteHandler (map options ) ``{ - integer uid = tointeger (options ["uidnumber"]:options["uid"]:"-1"); + integer uid = tointeger (options ["uidNumber"]:options["uid"]:"-1"); string username = options ["username"]:""; boolean delete_home = haskey (options, "delete_home"); @@ -346,10 +346,10 @@ { Users::SelectUserByName (username); map u = Users::GetCurrentUser(); - if (is (u["uidnumber"]:nil, integer)) - uid = u["uidnumber"]:-1; - else if (is (u["uidnumber"]:nil, string)) - uid = tointeger (u["uidnumber"]:"-1"); + if (is (u["uidNumber"]:nil, integer)) + uid = u["uidNumber"]:-1; + else if (is (u["uidNumber"]:nil, string)) + uid = tointeger (u["uidNumber"]:"-1"); } if (Users::GetCurrentUser () == $[]) { @@ -376,7 +376,7 @@ */ define boolean UserEditHandler (map options) { - integer uid = tointeger (options ["uidnumber"]:options["uid"]:"-1"); + integer uid = tointeger (options ["uidNumber"]:options["uid"]:"-1"); string username = options ["username"]:""; string type = options["type"]:"local"; @@ -486,7 +486,7 @@ define boolean GroupShowHandler (map options ) ``{ map group = $[]; - integer gid = tointeger (options ["gidnumber"]:options["gid"]:"-1"); + integer gid = tointeger (options ["gidNumber"]:options["gid"]:"-1"); string groupname = options ["groupname"]:""; string type = options ["type"]:"local"; @@ -521,7 +521,7 @@ // label shown at command line (user attribute) "cn" : _("Group Name:"), // label shown at command line (user attribute) - "gidnumber" : _("GID:"), + "gidNumber" : _("GID:"), // label shown at command line (user attribute) "userlist" : _("List of Members:"), // label shown at command line (user attribute) @@ -548,7 +548,7 @@ */ define boolean GroupDeleteHandler (map options ) { - integer gid = tointeger (options ["gidnumber"]:options["gid"]:"-1"); + integer gid = tointeger (options ["gidNumber"]:options["gid"]:"-1"); string groupname = options ["cn"]:options["groupname"]:""; string type = options["type"]:"local"; @@ -638,7 +638,7 @@ */ define boolean GroupEditHandler (map options) { - integer gid = tointeger (options ["gidnumber"]:options["gid"]:"-1"); + integer gid = tointeger (options ["gidNumber"]:options["gid"]:"-1"); string groupname = options ["cn"]:options["groupname"]:""; string type = options["type"]:"local"; Modified: trunk/users/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/dialogs.ycp (original) +++ trunk/users/src/dialogs.ycp Mon Jul 21 16:10:36 2008 @@ -175,25 +175,25 @@ cn = user["cn"]:""; string tmp_fullname = cn; // for login proposing string default_home = Users::GetDefaultHome (user_type); - string home = user["homedirectory"]:default_home; - string org_home = user["org_homedirectory"]:home; + string home = user["homeDirectory"]:default_home; + string org_home = user["org_homeDirectory"]:home; string default_mode = sformat ("%1", 777 - tointeger (String::CutZeros (Users::GetUmask ()))); string mode = user["home_mode"]:default_mode; integer default_crypted_size = 100; integer crypted_home_size = GetInt (user["crypted_home_size"]:nil, 0); integer org_crypted_home_size = GetInt (user["org_user","crypted_home_size"]:nil, 0); - string password = (string)user["userpassword"]:nil; + string password = (string)user["userPassword"]:nil; string org_username = user["org_uid"]:username; - integer uid = GetInt (user["uidnumber"]:nil, nil); + integer uid = GetInt (user["uidNumber"]:nil, nil); integer gid = - GetInt (user["gidnumber"]:nil, Users::GetDefaultGID (user_type)); + GetInt (user["gidNumber"]:nil, Users::GetDefaultGID (user_type)); string dn = user["dn"]:""; boolean enabled = user["enabled"]:true; if (user["disabled"]:false) enabled = false; - string shell = user["loginshell"]:""; + string shell = user["loginShell"]:""; string defaultgroup = user["groupname"]:""; // additional parts of GECOS (shown by `finger <username>`) (passwd only) string addit_data = user["addit_data"]:""; @@ -212,12 +212,12 @@ sn = user["sn"]:SplitFullName(`sn, cn); } string givenname = ""; - if (haskey (user, "givenname")) + if (haskey (user, "givenName")) { - if (is (user["givenname"]:nil, list)) - givenname = user["givenname",0]:SplitFullName(`givenname, cn); - else if (is (user["givenname"]:nil, string)) - givenname = user["givenname"]:SplitFullName(`givenname, cn); + if (is (user["givenName"]:nil, list)) + givenname = user["givenName",0]:SplitFullName(`givenname, cn); + else if (is (user["givenName"]:nil, string)) + givenname = user["givenName"]:SplitFullName(`givenname, cn); } boolean create_home = user["create_home"]:true; @@ -268,20 +268,20 @@ cn = user["cn",0]:cn; else cn = user["cn"]:cn; - home = user["homedirectory"]:home; - org_home = user["org_homedirectory"]:org_home; + home = user["homeDirectory"]:home; + org_home = user["org_homeDirectory"]:org_home; crypted_home_size = GetInt (user["crypted_home_size"]:nil, 0); mode = user["home_mode"]:default_mode; - password = user["userpassword"]:password; + password = user["userPassword"]:password; org_username = user["org_uid"]:org_username; - uid = GetInt (user["uidnumber"]:nil, uid); - gid = GetInt (user["gidnumber"]:nil, gid); + uid = GetInt (user["uidNumber"]:nil, uid); + gid = GetInt (user["gidNumber"]:nil, gid); dn = user["dn"]:dn; enabled = user["enabled"]:true; if (user["disabled"]:false) enabled = false; - shell = user["loginshell"]:shell; + shell = user["loginShell"]:shell; defaultgroup = user["groupname"]:defaultgroup; addit_data = user["addit_data"]:addit_data; @@ -292,12 +292,12 @@ else sn = user["sn"]:SplitFullName(`sn, cn); } - if (haskey (user, "givenname")) + if (haskey (user, "givenName")) { - if (is (user["givenname"]:nil, list)) - givenname = user["givenname",0]:SplitFullName(`givenname, cn); - else if (is (user["givenname"]:nil, string)) - givenname = user["givenname"]:SplitFullName(`givenname, cn); + if (is (user["givenName"]:nil, list)) + givenname = user["givenName",0]:SplitFullName(`givenname, cn); + else if (is (user["givenName"]:nil, string)) + givenname = user["givenName"]:SplitFullName(`givenname, cn); } chown_home = user["chown_home"]:chown_home; @@ -621,15 +621,15 @@ */ define term get_password_term () { - string last_change = GetString (user["shadowlastchange"]:nil, "0"); - string expires = GetString (user["shadowexpire"]:nil, "0"); + string last_change = GetString (user["shadowLastChange"]:nil, "0"); + string expires = GetString (user["shadowExpire"]:nil, "0"); if (expires == "") expires = "0"; - integer inact = GetInt (user["shadowinactive"]:nil, -1); - integer max = GetInt (user["shadowmax"]:nil, -1); - integer min = GetInt (user["shadowmin"]:nil, -1); - integer warn = GetInt (user["shadowwarning"]:nil, -1); + integer inact = GetInt (user["shadowInactive"]:nil, -1); + integer max = GetInt (user["shadowMax"]:nil, -1); + integer min = GetInt (user["shadowMin"]:nil, -1); + integer warn = GetInt (user["shadowWarning"]:nil, -1); if (last_change != "0") { @@ -658,27 +658,27 @@ // label _("Last Password Change: %1"), last_change ))), `VSpacing (1), - `IntField (`id ("shadowwarning"), + `IntField (`id ("shadowWarning"), // intfield label _("Days &before Password Expiration to Issue Warning"), -1, 99999, warn), `VSpacing (0.5), - `IntField (`id ("shadowinactive"), + `IntField (`id ("shadowInactive"), // intfield label _("Days after Password Expires with Usable &Login"), -1, 99999, inact), `VSpacing (0.5), - `IntField (`id ("shadowmax"), + `IntField (`id ("shadowMax"), // intfield label _("Ma&ximum Number of Days for the Same Password"), -1, 99999, max), `VSpacing (0.5), - `IntField (`id ("shadowmin"), + `IntField (`id ("shadowMin"), // intfield label _("&Minimum Number of Days for the Same Password"), -1, 99999, min), `VSpacing (0.5), - `InputField (`id ("shadowexpire"), `opt (`hstretch), + `InputField (`id ("shadowExpire"), `opt (`hstretch), // textentry label _("Ex&piration Date"), exp_date) )), @@ -916,7 +916,7 @@ // if 'givenname' or 'sn' should be substitued, wait for it // and do not create cn now: if (!haskey (ldap_user_defaults, "sn") && - !haskey (ldap_user_defaults, "givenname")) + !haskey (ldap_user_defaults, "givenName")) { cn = givenname + ((givenname != "") ? " " : "") + sn; } @@ -935,10 +935,10 @@ continue; } } - if (haskey (user, "givenname") && is (user["givenname"]:nil, list)) - user ["givenname",0] = givenname; + if (haskey (user, "givenName") && is (user["givenName"]:nil, list)) + user ["givenName",0] = givenname; else - user ["givenname"] = givenname; + user ["givenName"] = givenname; if (haskey (user, "sn") && is (user["sn"]:nil, list)) user["sn",0] = sn; else @@ -1033,7 +1033,7 @@ { error_map = UsersSimple::CheckPasswordUI ($[ "uid" : username, - "userpassword" : pw1, + "userPassword" : pw1, "type" : user_type ], ui_map); if (error_map != $[]) @@ -1055,8 +1055,8 @@ // now saving plain text password if (user["encrypted"]:false) user["encrypted"] = false; - user ["userpassword"] = pw1; - user ["shadowlastchange"] = Users::LastChangeIsNow(); + user ["userPassword"] = pw1; + user ["shadowLastChange"] = Users::LastChangeIsNow(); password = pw1; } @@ -1067,7 +1067,7 @@ if (user_type == "ldap" && issubstring (home, "%")) { user = UsersLDAP::SubstituteValues ("user", user); - home = user["homedirectory"]:default_home; + home = user["homeDirectory"]:default_home; } if (home == default_home || home == "") home = default_home + username; @@ -1078,7 +1078,7 @@ if (user_type == "ldap" && issubstring (default_home, "%")) { map tmp_user = UsersLDAP::SubstituteValues ("user", user); - generated_home = tmp_user["homedirectory"]:home; + generated_home = tmp_user["homeDirectory"]:home; } if (home != generated_home && (what == "add_user" || Popup::YesNo (sformat ( @@ -1132,7 +1132,7 @@ continue; } } - user["homedirectory"] = home; + user["homeDirectory"] = home; user["chown_home"] = chown_home; // --------------------------------- username checks, part 2/2 @@ -1307,7 +1307,7 @@ map g = Users::GetGroupByName (new_defaultgroup, new_type); if (g == $[]) g = Users::GetGroupByName (new_defaultgroup, ""); - gid = GetInt (g["gidnumber"]:nil, gid); + gid = GetInt (g["gidNumber"]:nil, gid); } // check the homedirectory @@ -1420,10 +1420,10 @@ groups = new_groups; defaultgroup = new_defaultgroup; user_type = new_type; - user["homedirectory"] = new_home; - user["loginshell"] = new_shell; - user["gidnumber"] = gid; - user["uidnumber"] = new_i_uid; + user["homeDirectory"] = new_home; + user["loginShell"] = new_shell; + user["gidNumber"] = gid; + user["uidNumber"] = new_i_uid; user["grouplist"] = new_groups; user["groupname"] = new_defaultgroup; user["type"] = new_type; @@ -1437,19 +1437,19 @@ if (current == `passwordsettings && (ret == `next || tab)) { - string exp = (string)UI::QueryWidget (`id ("shadowexpire"), `Value); + string exp = (string)UI::QueryWidget (`id ("shadowExpire"), `Value); if (exp != "" && !regexpmatch (exp,"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]")) { // popup text: Don't reorder the letters YYYY-MM-DD!!! // The date must stay in this format Popup::Message(_("The expiration date must be in the format YYYY-MM-DD.")); - focus_tab (current, "shadowexpire"); + focus_tab (current, "shadowExpire"); continue; } foreach (string shadowsymbol, - ["shadowwarning", "shadowmax", "shadowmin", "shadowinactive"], + ["shadowWarning", "shadowMax", "shadowMin", "shadowInactive"], { if (user[shadowsymbol]:nil != UI::QueryWidget ( `id(shadowsymbol), `Value)) @@ -1460,13 +1460,13 @@ }); string new_exp_date = (string) - UI::QueryWidget(`id("shadowexpire"),`Value); + UI::QueryWidget(`id("shadowExpire"),`Value); if (new_exp_date != exp_date) { exp_date = new_exp_date; if (exp_date == "") { - user["shadowexpire"] = (user_type == "ldap") ? "" : "0"; + user["shadowExpire"] = (user_type == "ldap") ? "" : "0"; } else { @@ -1476,7 +1476,7 @@ if (seconds_s != "") { integer days = (tointeger (seconds_s)) / (60*60*24); - user["shadowexpire"] = sformat("%1", days); + user["shadowExpire"] = sformat("%1", days); } } } @@ -1709,7 +1709,7 @@ org_crypted_home_size == 0) { user["current_text_userpassword"] = (user["text_userpassword"]:nil != nil) ? - user["text_userpassword"]:nil : user["userpassword"]:""; + user["text_userpassword"]:nil : user["userPassword"]:""; } else { @@ -1791,8 +1791,8 @@ // create a local copy of current group map group = Users::GetCurrentGroup (); string groupname = group["cn"]:""; - string password = (string) group["userpassword"]:nil; - integer gid = GetInt (group["gidnumber"]:nil, -1); + string password = (string) group["userPassword"]:nil; + integer gid = GetInt (group["gidNumber"]:nil, -1); // these are the users with this group as a default: map more_users = group["more_users"]:$[]; // these are users from /etc/group: @@ -1841,8 +1841,8 @@ define void reinit_groupdata () { groupname = group["cn"]:groupname; - password = group["userpassword"]:password; - gid = GetInt (group["gidnumber"]:nil, gid); + password = group["userPassword"]:password; + gid = GetInt (group["gidNumber"]:nil, gid); more_users = group["more_users"]:more_users; userlist = group["userlist"]:userlist; group_type = group["type"]:group_type; @@ -2075,7 +2075,7 @@ { error_map = UsersSimple::CheckPasswordUI ($[ "cn" : new_groupname, - "userpassword" : pw1, + "userPassword" : pw1, "type" : group_type ], ui_map); if (error_map != $[]) @@ -2144,9 +2144,9 @@ // --------------------------------- now everything should be OK group["cn"] = new_groupname; - group["userpassword"] = password; + group["userPassword"] = password; group["more_users"] = more_users; - group["gidnumber"] = new_i_gid; + group["gidNumber"] = new_i_gid; group["type"] = new_type; if (group_type == "ldap") { Modified: trunk/users/src/inst_root.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/inst_root.ycp (original) +++ trunk/users/src/inst_root.ycp Mon Jul 21 16:10:36 2008 @@ -225,7 +225,7 @@ { error_map = UsersSimple::CheckPasswordUI ($[ "uid" : "root", - "userpassword" : pw1, + "userPassword" : pw1, "type" : "system", ], ui_map); if (error_map != $[]) Modified: trunk/users/src/inst_root_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_root_first.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/inst_root_first.ycp (original) +++ trunk/users/src/inst_root_first.ycp Mon Jul 21 16:10:36 2008 @@ -180,7 +180,7 @@ { error_map = UsersSimple::CheckPasswordUI ($[ "uid" : "root", - "userpassword" : pw1, + "userPassword" : pw1, "type" : "system", ], ui_map); if (error_map != $[]) Modified: trunk/users/src/inst_user.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/inst_user.ycp (original) +++ trunk/users/src/inst_user.ycp Mon Jul 21 16:10:36 2008 @@ -70,7 +70,7 @@ map stat = (map) SCR::Read (.target.stat, home); integer uid = stat["uid"]:-1; if (uid != -1) - user["uidnumber"] = uid; + user["uidNumber"] = uid; } string error = Users::AddUser (user); if (error == "") @@ -193,16 +193,16 @@ foreach (map user, (list >) import_u, { user["encrypted"] = true; // check if default group exists - if (haskey (user, "gidnumber")) + if (haskey (user, "gidNumber")) { - map g = Users::GetGroup (GetInt (user["gidnumber"]:nil, -1), ""); + map g = Users::GetGroup (GetInt (user["gidNumber"]:nil, -1), ""); if (g == $[]) { g = Users::GetGroupByName (user["groupname"]:"", ""); if (g != $[]) - user["gidnumber"] = g["gidnumber"]:-1; + user["gidNumber"] = g["gidNumber"]:-1; else - user = remove (user, "gidnumber"); + user = remove (user, "gidNumber"); } } string error = Users::AddUser (user); Modified: trunk/users/src/inst_user_first.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/inst_user_first.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/inst_user_first.ycp (original) +++ trunk/users/src/inst_user_first.ycp Mon Jul 21 16:10:36 2008 @@ -500,7 +500,7 @@ string user_type = user["type"]:"local"; string username = user["uid"]:""; string cn = user["cn"]:""; - string password = (string)user["userpassword"]:nil; + string password = (string)user["userPassword"]:nil; boolean autologin = UsersSimple::AutologinUsed (); // set the initial default value for autologin @@ -722,7 +722,7 @@ { error_map = UsersSimple::CheckPasswordUI ($[ "uid" : username, - "userpassword" : pw1, + "userPassword" : pw1, "type" : "local", ], ui_map); if (error_map != $[]) @@ -768,7 +768,7 @@ // save the first user data map user_map = $[ "uid" : username, - "userpassword" : password, + "userPassword" : password, "cn" : cn ]; UsersSimple::SetUsers ([user_map]); Modified: trunk/users/src/users_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_auto.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/users_auto.ycp (original) +++ trunk/users/src/users_auto.ycp Mon Jul 21 16:10:36 2008 @@ -56,7 +56,7 @@ "encrypted": false, ], $[ "username":"root", - "uidnumber": 0, + "uidNumber": 0, "user_password":"pass", ], ]; Modified: trunk/users/src/users_plugin_ldap_all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_ldap_all.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/users_plugin_ldap_all.ycp (original) +++ trunk/users/src/users_plugin_ldap_all.ycp Mon Jul 21 16:10:36 2008 @@ -63,7 +63,7 @@ string action = data["what"]:""; map tmp_data = $[]; - list<string> object_class = (list<string>)sort (data["objectclass"]:[]); + list<string> object_class = (list<string>)sort (data["objectClass"]:[]); // helptext 1/3 string help_text = _("<p> @@ -72,7 +72,7 @@ // helptext 1/3 (don't translate objectclass"), // %1 is list of values sformat (_("<p> -The list of attributes is given by the value of \"objectclass\" +The list of attributes is given by the value of \"objectClass\" (which is currently: <br>%1). </p> @@ -93,35 +93,33 @@ // (either because they were edited before or it is to hard to edit // them (objectclass, DN) list do_not_show_keys = (what == "user") ? - [ "uid", "username", "uidnumber", "homedirectory", - // "givenname", "sn", - "userpassword", "objectclass", "loginshell", "gidnumber", - "shadowlastchange", "shadowwarning", "shadowinactive", "shadowexpire", - "shadowmin", "shadowmax", "shadowflag" + [ "uid", "username", "uidNumber", "homeDirectory", + // "givenName", "sn", + "userPassword", "objectClass", "loginShell", "gidNumber", + "shadowLastChange", "shadowWarning", "shadowInactive", "shadowExpire", + "shadowMin", "shadowMax", "shadowFlag" ] : // and now for groups - [ "groupname", "gidnumber", "userpassword", "objectclass", "userlist", + [ "groupname", "gidNumber", "userPassword", "objectClass", "userlist", "cn", Ldap::member_attribute ]; // keys in user's map which are not saved anywhere list internal_keys = (what == "user") ? UsersLDAP::GetUserInternal () : UsersLDAP::GetGroupInternal (); - // show only attributes allowed by schema list allowed_attrs= Ldap::GetObjectAttributes (object_class); // do not allow editing of binary values (perl converts them to string) - list binary_attrs = [ "jpegphoto", "usercertificate" ]; + list binary_attrs = [ "jpegPhoto", "userCertificate" ]; // generate table items from already existing values foreach (string attr, any val, data, ``{ - string at = tolower (attr); - if (contains (internal_keys, at)) + if (contains (internal_keys, attr)) return; - if (contains (do_not_show_keys, at)) + if (contains (do_not_show_keys, attr)) return; - if (!contains (allowed_attrs, at)) + if (!contains (allowed_attrs, attr)) return; if (is (val, map) || val == nil) return; @@ -130,24 +128,24 @@ { value = (list<string>)val; } - if (contains (binary_attrs, at) || is (val, byteblock) || + if (contains (binary_attrs, attr) || is (val, byteblock) || (is (val, list) && is (value[0]:nil, byteblock))) { - y2warning ("binary value (%1) cannot be edited", at); + y2warning ("binary value (%1) cannot be edited", attr); return; } else if (is (val, integer)) { value = [ sformat ("%1", val) ]; - data [at] = value; + data [attr] = value; } else if (is (val, string)) { value = [ (string)val ]; - data [at] = value; + data [attr] = value; } - used_attributes = add (used_attributes, at); - items = add (items,`item (`id(at), at, mergestring(value,","))); + used_attributes = add (used_attributes, attr); + items = add (items,`item (`id(attr), attr, mergestring(value,","))); }); // generate table items with empty values Modified: trunk/users/src/users_plugin_ldap_shadowaccount.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/users_plugin_ldap_shadowaccount.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/users_plugin_ldap_shadowaccount.ycp (original) +++ trunk/users/src/users_plugin_ldap_shadowaccount.ycp Mon Jul 21 16:10:36 2008 @@ -65,15 +65,15 @@ // date of password expiration string exp_date = ""; - string last_change = GetString (data["shadowlastchange"]:nil, "0"); - string expires = GetString (data["shadowexpire"]:nil, "0"); + string last_change = GetString (data["shadowLastChange"]:nil, "0"); + string expires = GetString (data["shadowExpire"]:nil, "0"); if (expires == "") expires = "0"; - integer inact = GetInt (data["shadowinactive"]:nil, 0); - integer max = GetInt (data["shadowmax"]:nil, 0); - integer min = GetInt (data["shadowmin"]:nil, 0); - integer warn = GetInt (data["shadowwarning"]:nil, 0); + integer inact = GetInt (data["shadowInactive"]:nil, 0); + integer max = GetInt (data["shadowMax"]:nil, 0); + integer min = GetInt (data["shadowMin"]:nil, 0); + integer warn = GetInt (data["shadowWarning"]:nil, 0); if (last_change != "0") { @@ -102,27 +102,27 @@ // label _("Last Password Change: %1"), last_change ))), `VSpacing (1), - `IntField (`id ("shadowwarning"), + `IntField (`id ("shadowWarning"), // intfield label _("Days &before Password Expiration to Issue Warning"), -1, 99999, warn), `VSpacing (0.5), - `IntField (`id ("shadowinactive"), + `IntField (`id ("shadowInactive"), // intfield label _("Days after Password Expires with Usable &Login"), -1, 99999, inact), `VSpacing (0.5), - `IntField (`id ("shadowmax"), + `IntField (`id ("shadowMax"), // intfield label _("Ma&ximum Number of Days for the Same Password"), -1, 99999, max), `VSpacing (0.5), - `IntField (`id ("shadowmin"), + `IntField (`id ("shadowMin"), // intfield label _("&Minimum Number of Days for the Same Password"), -1, 99999, min), `VSpacing (0.5), - `TextEntry (`id ("shadowexpire"), + `TextEntry (`id ("shadowExpire"), // textentry label _("Ex&piration Date"), exp_date) )), @@ -147,19 +147,19 @@ if (ret == `next) { string exp = (string) - UI::QueryWidget (`id ("shadowexpire"), `Value); + UI::QueryWidget (`id ("shadowExpire"), `Value); if (exp != "" && !regexpmatch (exp,"[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]")) { // popup text: Don't reorder the letters YYYY-MM-DD!!! // The date must stay in this format Popup::Message(_("The expiration date must be in the format YYYY-MM-DD.")); - UI::SetFocus (`id ("shadowexpire")); + UI::SetFocus (`id ("shadowExpire")); continue; } foreach (string shadowsymbol, - ["shadowwarning","shadowmax","shadowmin", "shadowinactive"], + ["shadowWarning","shadowMax","shadowMin", "shadowInactive"], { string sval = sformat ("%1", UI::QueryWidget (`id(shadowsymbol), `Value)); @@ -170,13 +170,13 @@ }); string new_exp_date = (string) - UI::QueryWidget(`id("shadowexpire"),`Value); + UI::QueryWidget(`id("shadowExpire"),`Value); if (new_exp_date != exp_date) { exp_date = new_exp_date; if (exp_date == "") { - tmp_data["shadowexpire"] = ""; + tmp_data["shadowExpire"] = ""; } else { @@ -186,7 +186,7 @@ if (seconds_s != "") { integer days = (tointeger (seconds_s)) / (60*60*24); - tmp_data["shadowexpire"] = sformat("%1", days); + tmp_data["shadowExpire"] = sformat("%1", days); } } } Modified: trunk/users/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/widgets.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/src/widgets.ycp (original) +++ trunk/users/src/widgets.ycp Mon Jul 21 16:10:36 2008 @@ -299,24 +299,24 @@ // attributes are listed here, because during filter editing, the connection // to LDAP server doesn't have to be run yet list user_attributes = [ - "objectclass", "loginshell", "gecos", "description", "cn", "uid", - "uidnumber", "gidnumber", "homedirectory", "shadowlastchange", - "shadowmin", "shadowmax", "shadowwarning", "shadowinactive", - "shadowexpire", "shadowflag", "audio", "businesscategory", "carlicense", - "departmentnumber", "displayname", "employeenumber", "employeetype", - "givenname", "homephone", "homepostaladdress", "initials", "jpegphoto", - "labeleduri", "mail", "manager", "mobile", "o", "pager", "photo", - "roomnumber", "secretary", "usercertificate", "x500uniqueidentifier", - "preferredlanguage", "usersmimecertificate", "userpkcs12", "title", - "x121address", "registeredaddress", "destinationindicator", - "preferreddeliverymethod", "telexnumber", "teletexterminalidentifier", - "telephonenumber", "internationalisdnnumber","facsimiletelephonenumber", - "street", "postofficebox", "postalcode", "postaladdress", - "physicaldeliveryofficename", "ou", "st", "l", "seealso", "sn" + "objectClass", "loginShell", "gecos", "description", "cn", "uid", + "uidNumber", "gidNumber", "homeDirectory", "shadowLastChange", + "shadowMin", "shadowMax", "shadowWarning", "shadowInactive", + "shadowExpire", "shadowFlag", "audio", "businessCategory", "carLicense", + "departmentNumber", "displayName", "employeeNumber", "employeeType", + "givenName", "homePhone", "homePostalAddress", "initials", "jpegPhoto", + "labeledUri", "mail", "manager", "mobile", "o", "pager", "photo", + "roomNumber", "secretary", "userCertificate", "x500uniqueIdentifier", + "preferredLanguage", "userSMIMECertificate", "userPKCS12", "title", + "x121Address", "registeredAddress", "destinationIndicator", + "preferredDeliveryMethod", "telexNumber", "teletexTerminalIdentifier", + "telephoneNumber", "internationalISDNNumber","facsimileTelephoneNumber", + "street", "postOfficeBox", "postalCode", "postalAddress", + "physicalDeliveryOfficeName", "ou", "st", "l", "seeAlso", "sn" ]; list group_attributes = [ - "objectclass", "memberuid", "description", "gidnumber", - "businesscategory", "seealso", "owner", "ou", "o", "member", "cn" + "objectClass", "memberUid", "description", "gidNumber", + "businessCategory", "seeAlso", "owner", "ou", "o", "member", "cn" ]; list connectives = [ @@ -338,7 +338,7 @@ // helptext 3/4 _("<p>With <b>Default</b>, load the default filter from the user and group -configuration modules saved on the LDAP server (values of 'susesearchfilter' attributes). +configuration modules saved on the LDAP server (values of 'suseSearchFilter' attributes). If you are not connected yet, you are prompted for the password.</p> ") + @@ -346,7 +346,7 @@ _("<p><b>Example:</b> <br>With the user filter <br> -<tt>(&(objectclass=posixaccount)(uid=u*))</tt> +<tt>(&(objectClass=posixAccount)(uid=u*))</tt> <br> only obtain users with a username beginning with 'u'.</p> "); @@ -657,9 +657,9 @@ string type = UsersCache::GetUserType (); map user = Users::GetCurrentUser (); string username = user["uid"]:""; - string home = user["org_user","homedirectory"]:user["org_homedirectory"]:user["homedirectory"]:""; + string home = user["org_user","homeDirectory"]:user["org_homeDirectory"]:user["homeDirectory"]:""; integer uid = -1; - any uid_a = user["org_user","uidnumber"]:user["org_uidnumber"]:user["uidnumber"]:"-1"; + any uid_a = user["org_user","uidNumber"]:user["org_uidNumber"]:user["uidNumber"]:"-1"; if (is (uid_a, string)) uid = tointeger (uid_a); else uid = (integer) uid_a; @@ -1387,7 +1387,7 @@ if (Users::GetDefaultGroupname ("local") != new_defgroup) { map g = Users::GetGroupByName (new_defgroup, ""); - new_defaults["group"] = sformat ("%1", GetInt (g["gidnumber"]:nil, + new_defaults["group"] = sformat ("%1", GetInt (g["gidNumber"]:nil, Users::GetDefaultGID ("local"))); } if (new_defaults != $[]) Modified: trunk/users/testsuite/tests/AddGroup.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/AddGroup.out (original) +++ trunk/users/testsuite/tests/AddGroup.out Mon Jul 21 16:10:36 2008 @@ -19,19 +19,19 @@ Dump $[] Return Dump ---- current group (empty add, to get default values): -Dump $["gidnumber":"1000", "plugins":[], "type":"local", "what":"add_group"] +Dump $["gidNumber":"1000", "plugins":[], "type":"local", "what":"add_group"] Return Dump ---- current group (after rich add): -Dump $["cn":"testgrp", "gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"] +Dump $["cn":"testgrp", "gidNumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"] Execute .target.bash_output "echo 'testgrp' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"testgrp"] Return Dump ---- check group after add: Dump Dump ---- user 'hh': -Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] +Dump $["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo"] Return true Dump ---- user 'hh': -Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$["testgrp":"1"], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"500", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo", "what":"group_change"] +Dump $["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$["testgrp":"1"], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "org_homeDirectory":"/home/hh", "org_uid":"hh", "org_uidNumber":"500", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo", "what":"group_change"] Dump ========================================================== Dump local group names: Dump ["testgrp", "users"] @@ -39,7 +39,7 @@ Return Return Dump ---- current group after add: -Dump $["cn":"new", "gidnumber":"0", "plugins":[], "type":"system", "what":"add_group"] +Dump $["cn":"new", "gidNumber":"0", "plugins":[], "type":"system", "what":"add_group"] Execute .target.bash_output "echo 'new' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"new"] Return Dump ---- check group after add: @@ -48,7 +48,7 @@ Return Return Dump ---- current group after add): -Dump $["cn":"testgrp", "gidnumber":"1000", "plugins":[], "type":"local", "what":"add_group"] +Dump $["cn":"testgrp", "gidNumber":"1000", "plugins":[], "type":"local", "what":"add_group"] Execute .target.bash_output "echo 'testgrp' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"testgrp"] Return There is a conflict between the entered Dump ---- check group after add: @@ -59,7 +59,7 @@ Return Return Dump ---- current group after add: -Dump $["cn":"t", "gidnumber":"1000", "plugins":[], "type":"local", "what":"add_group"] +Dump $["cn":"t", "gidNumber":"1000", "plugins":[], "type":"local", "what":"add_group"] Return The group name must be between 2 and 32 characters in length. Dump ---- check group after add: Dump The group name must be between 2 and 32 characters in length. Modified: trunk/users/testsuite/tests/AddGroup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddGroup.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/AddGroup.ycp (original) +++ trunk/users/testsuite/tests/AddGroup.ycp Mon Jul 21 16:10:36 2008 @@ -99,7 +99,7 @@ Testsuite::Dump (sformat ("---- current group (empty add, to get default values):\n %1", Users::GetCurrentGroup ())); map group = $[ - "gidnumber" : 555, + "gidNumber" : 555, "cn" : "testgrp", "userlist" : $[ "hh" : 1 ], "password" :"x", @@ -136,7 +136,7 @@ EXEC ["target", "bash_output", "stdout"] = "new"; Testsuite::Test (``(Users::AddGroup ($[])), [READ, WRITE, EXEC], 0); - Testsuite::Test (``(Users::AddGroup ($[ "cn" : "new", "gidnumber": 0, "type": "system"])), + Testsuite::Test (``(Users::AddGroup ($[ "cn" : "new", "gidNumber": 0, "type": "system"])), [READ, WRITE, EXEC], 0); Testsuite::Dump (sformat ("---- current group after add:\n %1", Users::GetCurrentGroup ())); Modified: trunk/users/testsuite/tests/AddUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/AddUser.out (original) +++ trunk/users/testsuite/tests/AddUser.out Mon Jul 21 16:10:36 2008 @@ -15,25 +15,25 @@ Dump $[] Return Dump ---- current user (empty add): -Dump $["chown_home":true, "cn":"", "create_home":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uidnumber":"1000", "userpassword":nil, "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uidNumber":"1000", "userPassword":nil, "what":"add_user"] Return Dump ---- current user (after rich add): -Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/local/home/aaa", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"aaa", "uidnumber":"501", "userpassword":"crypted_qqqqq", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homeDirectory":"/local/home/aaa", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"aaa", "uidNumber":"501", "userPassword":"crypted_qqqqq", "what":"add_user"] Execute .target.bash_output "echo 'aaa' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"aaa"] Return Dump ---- current group (before user commit): -Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"] +Dump $["cn":"users", "gidNumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userPassword":"x", "userlist":$[]] Dump ---- check user after add: Dump Dump ---- commit user: Return true Dump ---- current group (afer user commit): -Dump $["cn":"users", "gidnumber":"100", "more_users":$["aaa":"1", "hh":"1", "ii":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"] +Dump $["cn":"users", "gidNumber":"100", "more_users":$["aaa":"1", "hh":"1", "ii":"1"], "org_cn":"users", "org_gidNumber":"100", "type":"local", "userPassword":"x", "userlist":$[], "what":"user_change_default"] Dump =================== no password ========================== Return Return Dump ---- current user (minimal add, used default values): -Dump $["chown_home":true, "cn":"", "create_home":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homedirectory":"/home/hhh", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hhh", "uidnumber":"1000", "userpassword":nil, "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homeDirectory":"/home/hhh", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hhh", "uidNumber":"1000", "userPassword":nil, "what":"add_user"] Execute .target.bash_output "echo 'hhh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hhh"] Return No password entered. Dump ---- check user after add: @@ -43,18 +43,18 @@ Return Return Dump ---- current user (just added): -Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homedirectory":"/home/root", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"root", "uidnumber":"1000", "userpassword":"crypted_qqqqq", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homeDirectory":"/home/root", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"root", "uidNumber":"1000", "userPassword":"crypted_qqqqq", "what":"add_user"] Execute .target.bash_output "echo 'root' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"root"] Return There is a conflict between the entered Dump ---- check user after add: Dump There is a conflict between the entered Dump username and an existing username. Dump Try another one. -Dump ==================== uidnumber problems =================== +Dump ==================== uidNumber problems =================== Return Return Dump ---- current user (just added): -Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homedirectory":"/home/rrr", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"rrr", "uidnumber":"5", "userpassword":"crypted_qqqqq", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homeDirectory":"/home/rrr", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"rrr", "uidNumber":"5", "userPassword":"crypted_qqqqq", "what":"add_user"] Return The selected user ID is not allowed. Dump ---- check user after add: Dump The selected user ID is not allowed. @@ -64,7 +64,7 @@ Return Return Dump ---- current user (just added): -Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homedirectory":"/home/iii$", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"iii$", "uidnumber":"1000", "userpassword":"crypted_qqqqq", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homeDirectory":"/home/iii$", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "text_userpassword":"qqqqq", "type":"local", "uid":"iii$", "uidNumber":"1000", "userPassword":"crypted_qqqqq", "what":"add_user"] Execute .target.bash_output "echo 'iii$' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":""] Return The username may contain only Dump ---- check user after add: @@ -76,7 +76,7 @@ Return Return Dump ---- current user (just added): -Dump $["chown_home":true, "cn":"", "create_home":true, "dn":"uid=iii$,dc=suse,dc=cz", "encrypted":true, "gidnumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homedirectory":"/home/ldap/iii", "loginshell":"", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "text_userpassword":"qqqqq", "type":"ldap", "uid":"iii$", "uidnumber":"1000", "userpassword":"crypted_qqqqq", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "dn":"uid=iii$,dc=suse,dc=cz", "encrypted":true, "gidNumber":"100", "grouplist":$["audio":"1", "video":"1"], "groupname":"users", "homeDirectory":"/home/ldap/iii", "loginShell":"", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "text_userpassword":"qqqqq", "type":"ldap", "uid":"iii$", "uidNumber":"1000", "userPassword":"crypted_qqqqq", "what":"add_user"] Execute .target.bash_output "echo 'iii' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"iii"] Return Dump ---- check user after add: Modified: trunk/users/testsuite/tests/AddUser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/AddUser.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/AddUser.ycp (original) +++ trunk/users/testsuite/tests/AddUser.ycp Mon Jul 21 16:10:36 2008 @@ -83,13 +83,13 @@ Testsuite::Dump (sformat ("---- current user (empty add):\n %1", Users::GetCurrentUser ())); map user = $[ - "uidnumber" : 501, + "uidNumber" : 501, "uid" :"aaa", - "gidnumber" : 100, + "gidNumber" : 100, "groupname" : "users", "grouplist" : $[ "audio" : 1 ], - "homedirectory" :"/local/home/aaa", - "userpassword" :"qqqqq", + "homeDirectory" :"/local/home/aaa", + "userPassword" :"qqqqq", "type" :"local", ]; @@ -131,7 +131,7 @@ Testsuite::Dump ("==================== username conflict ========================"); Testsuite::Test (``(Users::AddUser ($[])), [READ, WRITE, EXEC], 0); - Testsuite::Test (``(Users::AddUser ($[ "uid": "root", "userpassword": "qqqqq"])), + Testsuite::Test (``(Users::AddUser ($[ "uid": "root", "userPassword": "qqqqq"])), [READ, WRITE, EXEC], 0); Testsuite::Dump (sformat ("---- current user (just added):\n %1", Users::GetCurrentUser ())); @@ -141,14 +141,14 @@ Testsuite::Dump (sformat ("---- check user after add:\n %1", error)); - Testsuite::Dump ("==================== uidnumber problems ==================="); + Testsuite::Dump ("==================== uidNumber problems ==================="); Testsuite::Test (``(Users::AddUser ($[])), [READ, WRITE, EXEC], 0); Testsuite::Test (``(Users::AddUser ($[ "uid" : "rrr", - "uidnumber" : 5, + "uidNumber" : 5, "type" : "local", - "userpassword" : "qqqqq" + "userPassword" : "qqqqq" ])), [READ, WRITE, EXEC], 0); @@ -166,7 +166,7 @@ Testsuite::Test (``(Users::AddUser ($[ "uid" : "iii$", "type" : "local", - "userpassword" : "qqqqq" + "userPassword" : "qqqqq" ])), [READ, WRITE, EXEC], 0); @@ -183,8 +183,8 @@ Testsuite::Test (``(Users::AddUser ($[ "uid" : "iii$", "type" : "ldap", - "homedirectory" : "/home/ldap/iii", - "userpassword" : "qqqqq" + "homeDirectory" : "/home/ldap/iii", + "userPassword" : "qqqqq" ])), [READ, WRITE, EXEC], 0); @@ -200,8 +200,8 @@ Testsuite::Dump ("============== duplicated UID number ====================="); Testsuite::Test (``(Users::AddUser ($[])), [READ, WRITE, EXEC], 0); - Testsuite::Test (``(Users::AddUser ($[ "uid": "admin", "uidnumber": 0, - "userpassword": "qqqqq", "type" : "system"])), [READ, WRITE, EXEC], 0); + Testsuite::Test (``(Users::AddUser ($[ "uid": "admin", "uidNumber": 0, + "userPassword": "qqqqq", "type" : "system"])), [READ, WRITE, EXEC], 0); EXEC ["target", "bash_output", "stdout"] = "admin"; Modified: trunk/users/testsuite/tests/BuildAdditional.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/BuildAdditional.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/BuildAdditional.out (original) +++ trunk/users/testsuite/tests/BuildAdditional.out Mon Jul 21 16:10:36 2008 @@ -12,7 +12,7 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Return Dump ---- current group: -Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"] +Dump $["cn":"audio", "gidNumber":"17", "more_users":$[], "type":"system", "userPassword":"x", "userlist":$["ii":"1"]] Dump ---- create additional users list: Dump Return [`item (`id ("at"), "at", false), `item (`id ("bin"), "bin", false), `item (`id ("daemon"), "daemon", false), `item (`id ("hh"), "hh", false), `item (`id ("ii"), "ii", true), `item (`id ("mail"), "mail", false), `item (`id ("nobody"), "nobody", false), `item (`id ("root"), "root", false), `item (`id ("uucp"), "uucp", false)] Modified: trunk/users/testsuite/tests/CheckPassword.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/CheckPassword.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/CheckPassword.ycp (original) +++ trunk/users/testsuite/tests/CheckPassword.ycp Mon Jul 21 16:10:36 2008 @@ -19,7 +19,7 @@ Testsuite::Test (``(UsersSimple::CheckPasswordUI ($[ "uid" : username, - "userpassword" : pw, + "userPassword" : pw, "type" : "local" ], $[])), [R,W,E], 0); } Modified: trunk/users/testsuite/tests/ConvertMap.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/ConvertMap.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/ConvertMap.out (original) +++ trunk/users/testsuite/tests/ConvertMap.out Mon Jul 21 16:10:36 2008 @@ -1,24 +1,24 @@ Dump ========================================================== Dump --------- user (loginshell is changed): -Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/csh", "modified":"edited", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/bash", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}IVj2W92x/IuFs"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}IVj2W92x/IuFs", "what":"edit_user"] -Return $["loginshell":"/bin/csh"] +Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/csh", "modified":"edited", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/bash", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}IVj2W92x/IuFs"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}IVj2W92x/IuFs", "what":"edit_user"] +Return $["loginShell":"/bin/csh"] Dump --------- converted : -Dump $["loginshell":"/bin/csh"] +Dump $["loginShell":"/bin/csh"] Dump ========================================================== Dump --------- user (new password): -Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/csh", "modified":"edited", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/bash", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}IVj2W92x/IuFs"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"qqqqq", "what":"edit_user"] -Return $["loginshell":"/bin/csh", "userpassword":"{crypt}qqqqq"] +Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/csh", "modified":"edited", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/bash", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}IVj2W92x/IuFs"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"qqqqq", "what":"edit_user"] +Return $["loginShell":"/bin/csh", "userPassword":"{crypt}qqqqq"] Dump --------- converted : -Dump $["loginshell":"/bin/csh", "userpassword":"{crypt}qqqqq"] +Dump $["loginShell":"/bin/csh", "userPassword":"{crypt}qqqqq"] Dump ========================================================== Dump --------- user (new object class): -Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/csh", "modified":"edited", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/bash", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}qqqqq"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}qqqqq", "what":"edit_user"] -Return $["loginshell":"/bin/csh", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"]] +Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/csh", "modified":"edited", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"], "org_uid":"test2", "org_uidnumber":11111, "org_user":$["dn":"uid=test2,ou=people,dc=suse,dc=cz", "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/bash", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}qqqqq"], "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}qqqqq", "what":"edit_user"] +Return $["loginShell":"/bin/csh", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"]] Dump --------- converted : -Dump $["loginshell":"/bin/csh", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"]] +Dump $["loginShell":"/bin/csh", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"]] Dump ========================================================== Dump --------- user (removed 'org_user' submap): -Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidnumber":100, "grouplist":$["audio":1], "groupname":"users", "loginshell":"/bin/csh", "modified":"edited", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"], "org_uid":"test2", "org_uidnumber":11111, "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidnumber":11111, "userpassword":"{crypt}qqqqq", "what":"edit_user"] -Return $["gecos":"test", "gidnumber":"100", "loginshell":"/bin/csh", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"], "uid":"test2", "uidnumber":"11111", "userpassword":"{crypt}qqqqq"] +Dump $["dn":"uid=test2,ou=people,dc=suse,dc=cz", "encrypted":true, "gecos":"test", "gidNumber":100, "grouplist":$["audio":1], "groupname":"users", "loginShell":"/bin/csh", "modified":"edited", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"], "org_uid":"test2", "org_uidnumber":11111, "plugins":["UsersPluginLDAPAll"], "type":"ldap", "uid":"test2", "uidNumber":11111, "userPassword":"{crypt}qqqqq", "what":"edit_user"] +Return $["gecos":"test", "gidNumber":"100", "loginShell":"/bin/csh", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"], "uid":"test2", "uidNumber":"11111", "userPassword":"{crypt}qqqqq"] Dump --------- converted : -Dump $["gecos":"test", "gidnumber":"100", "loginshell":"/bin/csh", "objectclass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount"], "uid":"test2", "uidnumber":"11111", "userpassword":"{crypt}qqqqq"] +Dump $["gecos":"test", "gidNumber":"100", "loginShell":"/bin/csh", "objectClass":["inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount"], "uid":"test2", "uidNumber":"11111", "userPassword":"{crypt}qqqqq"] Modified: trunk/users/testsuite/tests/ConvertMap.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/ConvertMap.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/ConvertMap.ycp (original) +++ trunk/users/testsuite/tests/ConvertMap.ycp Mon Jul 21 16:10:36 2008 @@ -27,8 +27,8 @@ "schema": $[ "oc": $[ "may": [ - "gidnumber", "gecos", "objectclass", "uid", "uidnumber", - "userpassword", "loginshell" + "gidNumber", "gecos", "objectClass", "uid", "uidNumber", + "userPassword", "loginShell" ], ], ], @@ -43,35 +43,35 @@ map user = $[ "dn" : "uid=test2,ou=people,dc=suse,dc=cz", - "gidnumber" : 100, + "gidNumber" : 100, "groupname" : "users", "encrypted" : true, "gecos" : "test", "grouplist" : $[ "audio" : 1 ], - "loginshell" : "/bin/csh", + "loginShell" : "/bin/csh", "modified" : "edited", - "objectclass" : [ "inetOrgPerson", "posixAccount", "shadowAccount", "top" ], + "objectClass" : [ "inetOrgPerson", "posixAccount", "shadowAccount", "top" ], "org_uid" : "test2", "org_uidnumber" : 11111, "plugins" : [ "UsersPluginLDAPAll" ], "type" : "ldap", "uid" : "test2", - "uidnumber" : 11111, - "userpassword" : "{crypt}IVj2W92x/IuFs", + "uidNumber" : 11111, + "userPassword" : "{crypt}IVj2W92x/IuFs", "what" : "edit_user", "org_user" : $[ "dn" : "uid=test2,ou=people,dc=suse,dc=cz", - "gidnumber" : 100, + "gidNumber" : 100, "groupname" : "users", "gecos" : "test", - "loginshell" : "/bin/bash", + "loginShell" : "/bin/bash", "grouplist" : $[ "audio" : 1 ], - "objectclass" : [ "inetOrgPerson", "posixAccount", "shadowAccount", "top" ], + "objectClass" : [ "inetOrgPerson", "posixAccount", "shadowAccount", "top" ], "type" : "ldap", "uid" : "test2", - "uidnumber" : 11111, - "userpassword" : "{crypt}IVj2W92x/IuFs", + "uidNumber" : 11111, + "userPassword" : "{crypt}IVj2W92x/IuFs", ] ]; @@ -83,7 +83,7 @@ Testsuite::Dump ("=========================================================="); - user["userpassword"] = "qqqqq"; + user["userPassword"] = "qqqqq"; Testsuite::Dump (sformat ("--------- user (new password):\n %1", user)); @@ -93,9 +93,9 @@ Testsuite::Dump ("=========================================================="); - user["objectclass"] = [ "inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambasamaccount" ]; - user["userpassword"] = converted["userpassword"]:""; - user["org_user", "userpassword"] = converted["userpassword"]:""; + user["objectClass"] = [ "inetOrgPerson", "posixAccount", "shadowAccount", "top", "sambaSamAccount" ]; + user["userPassword"] = converted["userPassword"]:""; + user["org_user", "userPassword"] = converted["userPassword"]:""; Testsuite::Dump (sformat ("--------- user (new object class):\n %1", user)); Modified: trunk/users/testsuite/tests/DeleteUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/DeleteUser.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/DeleteUser.out (original) +++ trunk/users/testsuite/tests/DeleteUser.out Mon Jul 21 16:10:36 2008 @@ -11,25 +11,25 @@ Write .target.ycp "/var/lib/YaST2/users.ycp" $[] true Return Dump local users: -Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil], "ii":$["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil]] +Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":nil], "ii":$["addit_data":"", "cn":"Test user", "gidNumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homeDirectory":"/home/ii", "loginShell":"/bin/bash", "type":"local", "uid":"ii", "uidNumber":"555", "userPassword":nil]] Dump local user names: Dump ["hh", "ii"] Dump local group names: Dump ["users"] Dump ---- user 'ii': -Dump $["addit_data":"", "cn":"Test user", "gidnumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homedirectory":"/home/ii", "loginshell":"/bin/bash", "type":"local", "uid":"ii", "uidnumber":"555", "userpassword":nil] +Dump $["addit_data":"", "cn":"Test user", "gidNumber":"100", "grouplist":$["audio":"1"], "groupname":"users", "homeDirectory":"/home/ii", "loginShell":"/bin/bash", "type":"local", "uid":"ii", "uidNumber":"555", "userPassword":nil] Dump ---- group 'audio': -Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"] +Dump $["cn":"audio", "gidNumber":"17", "more_users":$[], "type":"system", "userPassword":"x", "userlist":$["ii":"1"]] Dump ---- group 'users': -Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userlist":$[], "userpassword":"x"] +Dump $["cn":"users", "gidNumber":"100", "more_users":$["hh":"1", "ii":"1"], "type":"local", "userPassword":"x", "userlist":$[]] Dump ==================== running delete ====================== Return true Return true Dump local user names: Dump ["hh"] Dump local users: -Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":nil]] +Dump $["hh":$["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":nil]] Dump ---- group 'audio': -Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$[], "userpassword":"x", "what":"user_change"] +Dump $["cn":"audio", "gidNumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidNumber":"17", "type":"system", "userPassword":"x", "userlist":$[], "what":"user_change"] Dump ---- group 'users': -Dump $["cn":"users", "gidnumber":"100", "more_users":$["hh":"1"], "org_cn":"users", "org_gidnumber":"100", "type":"local", "userlist":$[], "userpassword":"x", "what":"user_change_default"] +Dump $["cn":"users", "gidNumber":"100", "more_users":$["hh":"1"], "org_cn":"users", "org_gidNumber":"100", "type":"local", "userPassword":"x", "userlist":$[], "what":"user_change_default"] Modified: trunk/users/testsuite/tests/EditUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUser.out (original) +++ trunk/users/testsuite/tests/EditUser.out Mon Jul 21 16:10:36 2008 @@ -13,11 +13,11 @@ Return Return nil Dump ---- user 'hh': -Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] +Dump $["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo"] Read .anyxml "/etc/security/pam_mount.conf.xml" nil Return Dump ---- user 'hh': -Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_uidnumber":"500", "org_user":$["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"], "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"heslo", "what":"edit_user"] +Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "org_uidNumber":"500", "org_user":$["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo"], "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"501", "userPassword":"heslo", "what":"edit_user"] Execute .target.bash_output "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"] Return Dump ---- check user after edit: @@ -42,11 +42,11 @@ Dump $[] Return nil Dump ---- user 501: -Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"heslo", "what":"edit_user"] +Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "org_homeDirectory":"/home/hh", "org_uid":"hh", "org_uidNumber":"501", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"501", "userPassword":"heslo", "what":"edit_user"] Read .anyxml "/etc/security/pam_mount.conf.xml" nil Return Dump ---- user 'hh': -Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/new/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "org_user":$["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "org_homedirectory":"/home/hh", "org_uid":"hh", "org_uidnumber":"501", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"heslo", "what":"edit_user"], "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"501", "userpassword":"heslo", "what":"edit_user"] +Dump $["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/new/home/hh", "loginShell":"/bin/bash", "org_homeDirectory":"/home/hh", "org_uid":"hh", "org_uidNumber":"501", "org_user":$["addit_data":"", "chown_home":true, "cn":"HaHa", "create_home":true, "crypted_home_size":"0", "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "org_homeDirectory":"/home/hh", "org_uid":"hh", "org_uidNumber":"501", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"501", "userPassword":"heslo", "what":"edit_user"], "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"501", "userPassword":"heslo", "what":"edit_user"] Execute .target.bash_output "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"] Return Dump ---- check user after edit: Modified: trunk/users/testsuite/tests/EditUser.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUser.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUser.ycp (original) +++ trunk/users/testsuite/tests/EditUser.ycp Mon Jul 21 16:10:36 2008 @@ -86,7 +86,7 @@ Testsuite::Dump (sformat ("---- user 'hh':\n %1", Users::GetCurrentUser ())); map changes = $[ - "uidnumber" : 501, + "uidNumber" : 501, ]; Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0); @@ -114,7 +114,7 @@ Testsuite::Dump (sformat ("---- user 501:\n %1", Users::GetCurrentUser ())); changes = $[ - "homedirectory" : "/new/home/hh", + "homeDirectory" : "/new/home/hh", ]; Testsuite::Test (``(Users::EditUser (changes)), [READ, WRITE, EXEC], 0); Modified: trunk/users/testsuite/tests/EditUsersGroups.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUsersGroups.out (original) +++ trunk/users/testsuite/tests/EditUsersGroups.out Mon Jul 21 16:10:36 2008 @@ -19,11 +19,11 @@ Execute .target.bash_output "echo 'hh' | grep '^[[:alpha:]_][[:alnum:]_.-]*[[:alnum:]_.$-]\\?$'" $["LANG":"C"] $["stdout":"hh"] Return Dump ---- unchanged group 'ggl': -Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"] +Dump $["cn":"ggl", "gidNumber":"555", "modified":"added", "org_cn":"ggl", "org_gidNumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$["hh":"1"], "what":"add_group"] Dump ---- unchanged group 'audio': -Dump $["cn":"audio", "gidnumber":"17", "more_users":$[], "type":"system", "userlist":$["ii":"1"], "userpassword":"x"] +Dump $["cn":"audio", "gidNumber":"17", "more_users":$[], "type":"system", "userPassword":"x", "userlist":$["ii":"1"]] Return true Dump ---- changed group 'ggl': -Dump $["cn":"ggl", "gidnumber":"555", "modified":"added", "org_cn":"ggl", "org_gidnumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$[], "what":"user_change"] +Dump $["cn":"ggl", "gidNumber":"555", "modified":"added", "org_cn":"ggl", "org_gidNumber":"555", "password":"x", "plugins":[], "type":"local", "userlist":$[], "what":"user_change"] Dump ---- changed group 'audio': -Dump $["cn":"audio", "gidnumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidnumber":"17", "type":"system", "userlist":$["hh":"1", "ii":"1"], "userpassword":"x", "what":"user_change"] +Dump $["cn":"audio", "gidNumber":"17", "modified":"edited", "more_users":$[], "org_cn":"audio", "org_gidNumber":"17", "type":"system", "userPassword":"x", "userlist":$["hh":"1", "ii":"1"], "what":"user_change"] Modified: trunk/users/testsuite/tests/EditUsersGroups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/EditUsersGroups.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/EditUsersGroups.ycp (original) +++ trunk/users/testsuite/tests/EditUsersGroups.ycp Mon Jul 21 16:10:36 2008 @@ -70,7 +70,7 @@ Testsuite::Test (``(Users::Read ()), [READ, WRITE, EXEC], 0); map group = $[ - "gidnumber" : 555, + "gidNumber" : 555, "cn" : "ggl", "userlist" : $[ "hh" : 1 ], "password" :"x", Modified: trunk/users/testsuite/tests/Import.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Import.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/Import.out (original) +++ trunk/users/testsuite/tests/Import.out Mon Jul 21 16:10:36 2008 @@ -14,4 +14,4 @@ Dump ["ggg", "hh", "ii"] Return nil Dump ---- user 'ggg': -Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/ggg", "loginshell":"", "modified":"added", "org_homedirectory":"/home/ggg", "org_uid":"ggg", "org_uidnumber":"1000", "plugins":[], "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"ggg", "uidnumber":"1000", "userpassword":"crypted_password", "what":"add_user"] +Dump $["chown_home":true, "cn":"", "create_home":true, "encrypted":true, "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/ggg", "loginShell":"", "modified":"added", "org_homeDirectory":"/home/ggg", "org_uid":"ggg", "org_uidNumber":"1000", "plugins":[], "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"ggg", "uidNumber":"1000", "userPassword":"crypted_password", "what":"add_user"] Modified: trunk/users/testsuite/tests/ImportExportUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/ImportExportUser.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/ImportExportUser.out (original) +++ trunk/users/testsuite/tests/ImportExportUser.out Mon Jul 21 16:10:36 2008 @@ -2,6 +2,6 @@ Dump importing: Dump $["encrypted":true, "forename":"aa", "gid":500, "grouplist":"audio", "home":"/home/aaa", "password_settings":$["inact":-1, "max":99999, "min":0, "warn":7], "shell":"/bin/bash", "surname":"A", "uid":500, "user_password":"5OkhN2nLxMfEY", "username":"aaa"] Dump ==== processing ImportUser... ============================ -Return $["cn":"aa A", "encrypted":true, "gidnumber":"500", "grouplist":$["audio":"1"], "homedirectory":"/home/aaa", "loginshell":"/bin/bash", "modified":"imported", "shadowinactive":"-1", "shadowlastchange":"0", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"aaa", "uidnumber":"500", "userpassword":"5OkhN2nLxMfEY"] +Return $["cn":"aa A", "encrypted":true, "gidNumber":"500", "grouplist":$["audio":"1"], "homeDirectory":"/home/aaa", "loginShell":"/bin/bash", "modified":"imported", "shadowInactive":"-1", "shadowLastChange":"0", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"aaa", "uidNumber":"500", "userPassword":"5OkhN2nLxMfEY"] Dump ==== processing ExportUser... ============================ Return $["encrypted":true, "fullname":"aa A", "gid":"500", "home":"/home/aaa", "password_settings":$["inact":"-1", "max":"99999", "min":"0", "warn":"7"], "shell":"/bin/bash", "uid":"500", "user_password":"5OkhN2nLxMfEY", "username":"aaa"] Modified: trunk/users/testsuite/tests/Read.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/Read.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/Read.out (original) +++ trunk/users/testsuite/tests/Read.out Mon Jul 21 16:10:36 2008 @@ -13,8 +13,8 @@ Return Return nil Dump ---- user hh: -Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] +Dump $["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo"] Return nil Dump ---- user hh2: -Dump $["addit_data":"", "cn":"HaHa2", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh2", "loginshell":"/bin/bash", "type":"local", "uid":"hh2", "uidnumber":"500", "userpassword":nil] +Dump $["addit_data":"", "cn":"HaHa2", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh2", "loginShell":"/bin/bash", "type":"local", "uid":"hh2", "uidNumber":"500", "userPassword":nil] Dump ========================================================== Modified: trunk/users/testsuite/tests/SelectUser.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/SelectUser.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/SelectUser.out (original) +++ trunk/users/testsuite/tests/SelectUser.out Mon Jul 21 16:10:36 2008 @@ -13,11 +13,11 @@ Return Return nil Dump selected user with id 500: -Dump $["addit_data":"", "cn":"HaHa", "gidnumber":"100", "grouplist":$[], "groupname":"users", "homedirectory":"/home/hh", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13727", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"local", "uid":"hh", "uidnumber":"500", "userpassword":"heslo"] +Dump $["addit_data":"", "cn":"HaHa", "gidNumber":"100", "grouplist":$[], "groupname":"users", "homeDirectory":"/home/hh", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13727", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"local", "uid":"hh", "uidNumber":"500", "userPassword":"heslo"] Dump ========================================================== Return nil Dump selected user with id 25: -Dump $["addit_data":"", "cn":"Batch jobs daemon", "gidnumber":"25", "grouplist":$[], "groupname":"", "homedirectory":"/var/spool/atjobs", "loginshell":"/bin/bash", "shadowexpire":"", "shadowflag":"", "shadowinactive":"", "shadowlastchange":"13636", "shadowmax":"99999", "shadowmin":"0", "shadowwarning":"7", "type":"system", "uid":"at", "uidnumber":"25", "userpassword":"!"] +Dump $["addit_data":"", "cn":"Batch jobs daemon", "gidNumber":"25", "grouplist":$[], "groupname":"", "homeDirectory":"/var/spool/atjobs", "loginShell":"/bin/bash", "shadowExpire":"", "shadowFlag":"", "shadowInactive":"", "shadowLastChange":"13636", "shadowMax":"99999", "shadowMin":"0", "shadowWarning":"7", "type":"system", "uid":"at", "uidNumber":"25", "userPassword":"!"] Dump ========================================================== Return nil Dump selected user with id 5001: Modified: trunk/users/testsuite/tests/SubstituteValues.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/SubstituteValues.out?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/SubstituteValues.out (original) +++ trunk/users/testsuite/tests/SubstituteValues.out Mon Jul 21 16:10:36 2008 @@ -1,2 +1,2 @@ -Dump $["cn":"%uid", "homedirectory":"/home/%uid", "uid":"hh"] -Return $["cn":"hh", "homedirectory":"/home/hh", "uid":"hh"] +Dump $["cn":"%uid", "homeDirectory":"/home/%uid", "uid":"hh"] +Return $["cn":"hh", "homeDirectory":"/home/hh", "uid":"hh"] Modified: trunk/users/testsuite/tests/SubstituteValues.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/testsuite/tests/SubstituteValues.ycp?rev=49295&r1=49294&r2=49295&view=diff ============================================================================== --- trunk/users/testsuite/tests/SubstituteValues.ycp (original) +++ trunk/users/testsuite/tests/SubstituteValues.ycp Mon Jul 21 16:10:36 2008 @@ -11,7 +11,7 @@ import "UsersLDAP"; map user = $[ - "homedirectory" : "/home/%uid", + "homeDirectory" : "/home/%uid", "cn" : "%uid", "uid" : "hh", ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org