Author: jsuchome
Date: Tue Nov 11 15:12:55 2008
New Revision: 53171
URL: http://svn.opensuse.org/viewcvs/yast?rev=53171&view=rev
Log:
- do not move LDAP objects in the tree when not needed (bnc#434324)
- 2.17.23
Modified:
trunk/users/VERSION
trunk/users/package/yast2-users.changes
trunk/users/src/UsersLDAP.pm
trunk/users/src/dialogs.ycp
Modified: trunk/users/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/VERSION?rev=53171&r1=53170&r2=53171&view=diff
==============================================================================
--- trunk/users/VERSION (original)
+++ trunk/users/VERSION Tue Nov 11 15:12:55 2008
@@ -1 +1 @@
-2.17.22
+2.17.23
Modified: trunk/users/package/yast2-users.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/package/yast2-users.changes?rev=53171&r1=53170&r2=53171&view=diff
==============================================================================
--- trunk/users/package/yast2-users.changes (original)
+++ trunk/users/package/yast2-users.changes Tue Nov 11 15:12:55 2008
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Nov 11 15:05:28 CET 2008 - jsuchome@suse.cz
+
+- do not move LDAP objects in the tree when not needed (bnc#434324)
+- 2.17.23
+
+-------------------------------------------------------------------
Wed Nov 5 12:33:06 CET 2008 - jsuchome@suse.cz
- button labels adapted to current style guide (bnc#440518)
Modified: trunk/users/src/UsersLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/UsersLDAP.pm?rev=53171&r1=53170&r2=53171&view=diff
==============================================================================
--- trunk/users/src/UsersLDAP.pm (original)
+++ trunk/users/src/UsersLDAP.pm Tue Nov 11 15:12:55 2008
@@ -958,7 +958,11 @@
if (!defined $user->{$user_attr} || $user->{$user_attr} eq "") {
return undef;
}
- return sprintf ("%s=%s,%s", $dn_attr, $user->{$user_attr}, $user_base);
+ my $base = $user_base;
+ $base = get_base ($user->{"dn"}) if ($user->{"dn"});
+ my $ret = sprintf ("%s=%s,%s", $dn_attr, $user->{$user_attr}, $base);
+ y2milestone ("new user DN: $ret");
+ return $ret;
}
##------------------------------------
@@ -975,7 +979,11 @@
if (!defined $group->{$group_attr} || $group->{$group_attr} eq "") {
return undef;
}
- return sprintf ("%s=%s,%s", $dn_attr, $group->{$group_attr}, $group_base);
+ my $base = $group_base;
+ $base = get_base ($group->{"dn"}) if ($group->{"dn"});
+ my $ret = sprintf ("%s=%s,%s", $dn_attr, $group->{$group_attr}, $base);
+ y2milestone ("new group DN: $ret");
+ return $ret;
}
##------------------------------------
@@ -1428,6 +1436,7 @@
my $new_base = get_base ($dn);
if ($new_base ne get_base ($arg_map{"dn"})) {
$arg_map{"newParentDN"} = $new_base;
+ y2milestone ("new_base $new_base, org_dn $org_dn, dn $dn");
}
}
if (!SCR->Write (".ldap.modify", \%arg_map, $self->ConvertMap ($user))) {
Modified: trunk/users/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/users/src/dialogs.ycp?rev=53171&r1=53170&r2=53171&view=diff
==============================================================================
--- trunk/users/src/dialogs.ycp (original)
+++ trunk/users/src/dialogs.ycp Tue Nov 11 15:12:55 2008
@@ -188,7 +188,6 @@
integer uid = GetInt (user["uidNumber"]:nil, nil);
integer gid =
GetInt (user["gidNumber"]:nil, Users::GetDefaultGID (user_type));
- string dn = user["dn"]:"";
boolean enabled = user["enabled"]:true;
if (user["disabled"]:false)
enabled = false;
@@ -276,7 +275,6 @@
org_username = user["org_uid"]:org_username;
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;
@@ -1816,8 +1814,6 @@
map