Attachment 113280 Details for Bug 220780

[patch] patch for /usr/share/YaST2/modules/UsersLDAP.pm

UsersLDAP.diff (text/plain), 2.17 KB, created by Jiří Suchomel on 2007-01-17 08:16:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jiří Suchomel

Created: 2007-01-17 08:16:04 UTC

Size: 2.17 KB

patch

obsolete

>Index: UsersLDAP.pm
>===================================================================
>--- UsersLDAP.pm	(revision 30669)
>+++ UsersLDAP.pm	(working copy)
>@@ -1121,12 +1121,20 @@
> 	    next;
> 	}
> 	if ($key eq "userpassword") {
>+y2internal ("pw val: $val");
> 	    if ($val eq "x" || $val eq "*") {
> 		next;
> 	    }
> 	    my $enc	= lc ($encryption);
>+y2internal ("enc is $enc");
>+	    # check for unchanged password before prepending the hash (#213574)
>+	    if (defined $org_object && defined $org_object->{$key}) {
>+y2internal ("org val is: ", $org_object->{$key});
>+		next if $val eq $org_object->{$key};
>+	    }
> 	    if ($enc ne "clear" && !($val =~ m/{$enc}/i)) {
> 		$val = sprintf ("{%s}%s", $enc, $val);
>+y2internal ("new val is $val");
> 	    }
> 	}
> 	# check if the attributes are allowed by objectclass
>@@ -1148,21 +1156,22 @@
> 	    }
> 	    $val = \@lval;
> 	}
>-	y2debug ("-------------------- key: $key, value: $val");
>+	y2internal ("-------------------- key: $key, value: $val");
> 
> 	# now remove the keys with the unchanged values...
> 	if (defined $org_object && defined $org_object->{$key}) {
> 
> 	    if (ref ($val) eq "ARRAY" && ref ($org_object->{$key}) eq "ARRAY"
> 		 && same_arrays ($val, $org_object->{$key})) {
>-		y2debug ("---- unchanged array key: $key, value: ", @$val);
>+		y2internal ("---- unchanged array key: $key, value: ", @$val);
> 		next;
> 	    }
> 	    elsif ($org_object->{$key} eq $val) {
>-		y2debug ("---------- unchanged key: $key, value: $val");
>+		y2internal ("---------- unchanged key: $key, value: $val");
> 		next;
> 	    }
> 	}
>+	y2internal ("-------------------- to save -> key : $key, value: $val");
> 	$ret{$key}	= $val;
>     }
>     return \%ret;
>@@ -1236,6 +1245,7 @@
>         if (!defined ($action) || defined ($ret{"msg"})) {
>             next; 
> 	}
>+y2internal ("writing user $username...");
> 	my $uid		= $user->{"uidnumber"};
> 	if (! defined $uid) { $uid	= GetDefaultUID (); }
>         my $home	= $user->{"homedirectory"} || "";
>@@ -1470,6 +1480,7 @@
>         if (!defined ($action) || defined ($ret{"msg"})) {
>             next; 
> 	}
>+y2internal ("writing group $groupname...");
> 	my $gid		= $group->{"gidnumber"};
> 	if (!defined $gid) { $gid	= GetDefaultGID (); }
> 	my %new_group	= ();

Actions: View | Diff

Attachments on bug 220780: 109588 | 112972 | 113016 | 113280