Changeset 107

Timestamp:

05/14/09 03:08:41 (15 years ago)

Author:

nanardon

Message:

• objects::set_fields is called also to terminate work, so always try update, but detect 'no update' error

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad

Files:

• Group.pm (modified) (5 diffs)
• User.pm (modified) (3 diffs)
• objects.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/Group.pm

@@ -48 +48 @@
     (
         qw(gidNumber description member memberUID), # sAMAccountName: conflict with user
+                                                    # must be uniq in AD
         ($mode !~ /w/
             ? qw(cn dn)
@@ -110 +111 @@
     my ($self, %data) = @_;
     my %ndata;
-    my $need_change = 0;
     while (my ($f, $val) = each(%data)) {
         $f eq 'memberUID' and do {
@@ -121 +121 @@
                 if ($users{$_}{e}) {
                     $self->{entry}->del(memberUID => $_);
-                    $need_change = 1;
                 } elsif ($users{$_}{n}) {
                     $self->{entry}->add(memberUID => $_);
-                    $need_change = 1;
                 } # else {} # can't happen
                 my $mesg = $self->{entry}->update($self->base->ldap);
@@ -139 +137 @@
                 if ($users{$_}{e}) {
                     $self->{entry}->del(member => $user->get_field('dn'));
-                    $need_change = 1;
                 } elsif ($users{$_}{n}) {
                     $self->{entry}->add(member => $user->get_field('dn'));
-                    $need_change = 1;
                 } # else {} # can't happen
             }
@@ -149 +145 @@
         $ndata{$f} = $val;
     }
-    $need_change || scalar(keys %ndata) or return '0E0';
     $self->SUPER::set_fields(%ndata);
 }

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/User.pm

@@ -123 +123 @@
     my ($self, %data) = @_;
     my %ndata;
-    my $needup = 0;
     while (my ($f, $val) = each(%data)) {
         $f eq 'memberOf' and do {
@@ -134 +133 @@
                 if ($users{$_}{e}) {
                     $self->{entry}->del(memberOf => $user->get_field('dn'));
-                    $needup = 1;
                 } elsif ($users{$_}{n}) {
                     $self->{entry}->add(memberOf => $user->get_field('dn'));
-                    $needup = 1;
                 } # else {} # can't happen
                 my $mesg = $self->{entry}->update($self->base->ldap);
@@ -145 +142 @@
         $ndata{$f} = $val;
     }
-    $needup || scalar(keys %ndata) or return '0E0';
     $self->SUPER::set_fields(%ndata);
 }

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ad/objects.pm

@@ -120 +120 @@
     my ($self, %fields) = @_;
 
-    my $needup = 0;
     foreach (keys %fields) {
         $self->get_field_name($_, 'w') or next;
         $self->_populate_entry($self->{entry}, $_, $fields{$_});
-        $needup = 1;
     }
     
-    $needup or return '0E0';
     my $mesg = $self->{entry}->update($self->base->ldap);
 
-    if ($mesg->code) {
+    if ($mesg->code && $mesg->code != 82) {
         warn $mesg->error;
         return;