Changeset 197

Timestamp:

05/26/09 20:48:34 (15 years ago)

Author:

nanardon

Message:

• fix create user in AD, trap some error

Location:

LATMOS-Accounts

Files:

• bin/la-sync (modified) (1 diff)
• lib/LATMOS/Accounts/Bases.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Bases/Ad/User.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Synchro.pm (modified) (1 diff)

LATMOS-Accounts/bin/la-sync

@@ -61 +61 @@
     foreach (@ARGV) {
         warn "Try to sync $otype: $_\n";
-        $sync->sync_object($otype, $_);
+        $sync->sync_object($otype, $_) or do {
+            warn "Error while synching $_ ($otype)\n";
+            exit 1;
+        }
     }
 } else {
     $sync->process() or warn "Sync has failed\n";
 }
+
+exit 0;

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

@@ -174 +174 @@
     my ($self, $otype, $id, %data) = @_;
     my $pclass = $self->_load_obj_class($otype);
-    $pclass->_create($self, $id, %data) or return;
+    $pclass->_create($self, $id, %data) or do {
+        return;
+    };
     $self->get_object($otype, $id);
 }
@@ -324 +326 @@
         return 'CREATE' if ($self->create_c_object($srcobj->type, $srcobj->id, %data));
     } else {
-        return '';
+        # No error, but creation is denied
+        return 'Creation skipped';
     }
 

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

@@ -91 +91 @@
     $entry->replace(objectClass => [ qw(top person organizationalPerson user)],);
     $entry->replace(userAccountControl => 66112);
-    $entry->replace(sAMAccountType => 0x30000000);
+    # 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);
@@ -98 +99 @@
     }
     my $msg = $base->ldap->add($entry);
+    warn $msg->error if ($msg->code);
     return $msg->code ? 0 : 1;
 }

LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -182 +182 @@
 sub sync_object {
     my ($self, $otype, $uid) = @_;
-    my $sobj = $self->from->get_object($otype, $uid) or return;
-    foreach ($self->to) {
-        $_->sync_object($sobj)
+    my $sobj = $self->from->get_object($otype, $uid) or do {
+        warn "Cannot get object for synching $uid ($otype)\n";
+        return;
+    };
+    foreach ($self->to) {
+        if (my $res = $_->sync_object($sobj)) {
+            print $_->label . " $uid ($otype) $res\n";
+        } else { warn "error synching $uid ($otype) to " . $_->label . "\n"; }
     }
     foreach ($self->to) {