|
Lines 1121-1132
Link Here
|
| 1121 |
next; |
1121 |
next; |
| 1122 |
} |
1122 |
} |
| 1123 |
if ($key eq "userpassword") { |
1123 |
if ($key eq "userpassword") { |
|
|
1124 |
y2internal ("pw val: $val"); |
| 1124 |
if ($val eq "x" || $val eq "*") { |
1125 |
if ($val eq "x" || $val eq "*") { |
| 1125 |
next; |
1126 |
next; |
| 1126 |
} |
1127 |
} |
| 1127 |
my $enc = lc ($encryption); |
1128 |
my $enc = lc ($encryption); |
|
|
1129 |
y2internal ("enc is $enc"); |
| 1130 |
# check for unchanged password before prepending the hash (#213574) |
| 1131 |
if (defined $org_object && defined $org_object->{$key}) { |
| 1132 |
y2internal ("org val is: ", $org_object->{$key}); |
| 1133 |
next if $val eq $org_object->{$key}; |
| 1134 |
} |
| 1128 |
if ($enc ne "clear" && !($val =~ m/{$enc}/i)) { |
1135 |
if ($enc ne "clear" && !($val =~ m/{$enc}/i)) { |
| 1129 |
$val = sprintf ("{%s}%s", $enc, $val); |
1136 |
$val = sprintf ("{%s}%s", $enc, $val); |
|
|
1137 |
y2internal ("new val is $val"); |
| 1130 |
} |
1138 |
} |
| 1131 |
} |
1139 |
} |
| 1132 |
# check if the attributes are allowed by objectclass |
1140 |
# check if the attributes are allowed by objectclass |
|
Lines 1148-1168
Link Here
|
| 1148 |
} |
1156 |
} |
| 1149 |
$val = \@lval; |
1157 |
$val = \@lval; |
| 1150 |
} |
1158 |
} |
| 1151 |
y2debug ("-------------------- key: $key, value: $val"); |
1159 |
y2internal ("-------------------- key: $key, value: $val"); |
| 1152 |
|
1160 |
|
| 1153 |
# now remove the keys with the unchanged values... |
1161 |
# now remove the keys with the unchanged values... |
| 1154 |
if (defined $org_object && defined $org_object->{$key}) { |
1162 |
if (defined $org_object && defined $org_object->{$key}) { |
| 1155 |
|
1163 |
|
| 1156 |
if (ref ($val) eq "ARRAY" && ref ($org_object->{$key}) eq "ARRAY" |
1164 |
if (ref ($val) eq "ARRAY" && ref ($org_object->{$key}) eq "ARRAY" |
| 1157 |
&& same_arrays ($val, $org_object->{$key})) { |
1165 |
&& same_arrays ($val, $org_object->{$key})) { |
| 1158 |
y2debug ("---- unchanged array key: $key, value: ", @$val); |
1166 |
y2internal ("---- unchanged array key: $key, value: ", @$val); |
| 1159 |
next; |
1167 |
next; |
| 1160 |
} |
1168 |
} |
| 1161 |
elsif ($org_object->{$key} eq $val) { |
1169 |
elsif ($org_object->{$key} eq $val) { |
| 1162 |
y2debug ("---------- unchanged key: $key, value: $val"); |
1170 |
y2internal ("---------- unchanged key: $key, value: $val"); |
| 1163 |
next; |
1171 |
next; |
| 1164 |
} |
1172 |
} |
| 1165 |
} |
1173 |
} |
|
|
1174 |
y2internal ("-------------------- to save -> key : $key, value: $val"); |
| 1166 |
$ret{$key} = $val; |
1175 |
$ret{$key} = $val; |
| 1167 |
} |
1176 |
} |
| 1168 |
return \%ret; |
1177 |
return \%ret; |
|
Lines 1236-1241
Link Here
|
| 1236 |
if (!defined ($action) || defined ($ret{"msg"})) { |
1245 |
if (!defined ($action) || defined ($ret{"msg"})) { |
| 1237 |
next; |
1246 |
next; |
| 1238 |
} |
1247 |
} |
|
|
1248 |
y2internal ("writing user $username..."); |
| 1239 |
my $uid = $user->{"uidnumber"}; |
1249 |
my $uid = $user->{"uidnumber"}; |
| 1240 |
if (! defined $uid) { $uid = GetDefaultUID (); } |
1250 |
if (! defined $uid) { $uid = GetDefaultUID (); } |
| 1241 |
my $home = $user->{"homedirectory"} || ""; |
1251 |
my $home = $user->{"homedirectory"} || ""; |
|
Lines 1470-1475
Link Here
|
| 1470 |
if (!defined ($action) || defined ($ret{"msg"})) { |
1480 |
if (!defined ($action) || defined ($ret{"msg"})) { |
| 1471 |
next; |
1481 |
next; |
| 1472 |
} |
1482 |
} |
|
|
1483 |
y2internal ("writing group $groupname..."); |
| 1473 |
my $gid = $group->{"gidnumber"}; |
1484 |
my $gid = $group->{"gidnumber"}; |
| 1474 |
if (!defined $gid) { $gid = GetDefaultGID (); } |
1485 |
if (!defined $gid) { $gid = GetDefaultGID (); } |
| 1475 |
my %new_group = (); |
1486 |
my %new_group = (); |