Changeset 203 for LATMOS-Accounts/lib/LATMOS

Timestamp:

05/27/09 03:45:05 (15 years ago)

Author:

nanardon

Message:

• fix attributes assigment in AD

Location:

LATMOS-Accounts/lib/LATMOS/Accounts

Files:

• Bases/Ad/User.pm (modified) (5 diffs)
• Utils.pm (modified) (1 diff)

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

@@ -53 +53 @@
         homeDirectory loginShell
         uidNumber gidNumber gecos
-        userPassword
         shadowLastChange shadowMin shadowMax
         shadowWarning shadowInactive shadowExpire
@@ -61 +60 @@
         ipPhone otherTelephone department
         title modbile homePhone
-        memberOf
         accountExpires
         streetAddress postalCode postOfficeBox l
@@ -71 +69 @@
         userAccountControl
         locked
+        memberOf
         ),
         ($mode !~ /w/
@@ -90 +89 @@
     $entry->replace('sAMAccountName', $id);
     $entry->replace(objectClass => [ qw(top person organizationalPerson user)],);
-    $entry->replace(userAccountControl => 66112);
+    # Must be 544 for creation...
+    $entry->replace(userAccountControl => 544); #66112);
     # This attributes cannot be set via LDAP:
     #$entry->replace(sAMAccountType => 0x30000000);
     $entry->replace(accountExpires => '9223372036854775807'); # TODO hardcoded, burk
     $entry->replace(userPrincipalName => "$id\@" . $base->ad_domain);
+    my %delayed;
     foreach (keys %data) {
+        /^(manager|memberOf)$/ and do {
+            $delayed{$_} = $data{$_};
+            next;
+        };
         $class->_populate_entry($entry, $_, $data{$_});
     }
     my $msg = $base->ldap->add($entry);
-    warn $msg->error if ($msg->code);
-    return $msg->code ? 0 : 1;
+    if ($msg->code) {
+        warn $msg->error;
+        return 0;
+    }
+    my $res = $base->get_object('user', $id)->set_fields(%delayed);
+    return defined($res) ? 1 : 0;
 }
 
@@ -146 +155 @@
             foreach (keys %users) {
                 $users{$_}{e} && $users{$_}{n} and next;
-                my $user = $self->base->get_object('group', $_) or next;
+                my $group = $self->base->get_object('group', $_) or next;
+                # memberOf field is read only
+                # so we modify the peer entry into peer object
                 if ($users{$_}{e}) {
-                    $self->{entry}->del(memberOf => $user->get_field('dn'));
+                    $group->{entry}->delete(member => $self->get_field('dn'));
                 } elsif ($users{$_}{n}) {
-                    $self->{entry}->add(memberOf => $user->get_field('dn'));
+                    $group->{entry}->add(member => $self->get_field('dn'));
                 } # else {} # can't happen
-                my $mesg = $self->{entry}->update($self->base->ldap);
+                my $mesg = $group->{entry}->update($self->base->ldap);
+                if ($mesg->code) {
+                    warn $mesg->error;
+                    return;
+                }
             }
             next;

LATMOS-Accounts/lib/LATMOS/Accounts/Utils.pm

@@ -15 +15 @@
 sub to_ascii {
     my ($text) = @_;
+    return $text unless(defined($text));
     utf8::decode($text) unless(utf8::is_utf8($text));
     $text =~ tr/uà âÀÂÄÀçéÚêëÉÈÊËïîÏÎöÎÖÔÌûÛÜ/uaaaAAAceeeeEEEEiiIIooOOuuUU/;