Changeset 1616

Timestamp:

01/08/16 21:20:39 (8 years ago)

Author:

nanardon

Message:

Fix upgrade of objectClass for user

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap

Files:

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

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm

@@ -81 +81 @@
             post => sub {
                 my ($self, $value) = @_;
-                if (!grep { $_ eq 'sambaSamAccount' }  $self->object->_get_attributes('objectClass')) {
-                    $self->_update_class(
-                        sambaSID => $self->base->sambaSID(_computeSSID($value))
-                    );
-                } else {
-                    $self->object->set_fields(sambaSID => $self->object->base->sambaSID(_computeSSID($value)));
-                }
+                $self->object->set_fields(sambaSID => $self->object->base->sambaSID(_computeSSID($value)));
             },
         },
@@ -143 +137 @@
         sambaLMPassword => { readable => 0, },
         sambaNTPassword => { readable => 0, },
-        sambaSid => { ro => 1 },
+        sambaSID => { ro => 1 },
     }
+    );
+}
+
+sub _update_class {
+    my ($self) = @_;
+
+    $self->SUPER::_update_class(
+        sambaSID => $self->base->sambaSID(
+            _computeSSID($self->_get_attributes('uidNumber'))
+        )
     );
 }
@@ -283 +287 @@
     my ($lm, $nt) = ntlmgen $clear_pass;
 
-    if (!grep { $_ eq 'sambaSamAccount' }  $self->get_attributes('objectClass')) {
-        $self->_update_class(
-            sambaSID => $self->base->sambaSID($self->_get_attributes('uidNumber') * 2 + 1000)
-        );
-    }
-
     my $res = $self->set_fields(
         userPassword    => $md5,

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/objects.pm

@@ -202 +202 @@
         my $cclass = join(',', sort $self->_my_ldap_classes);
         if ($oclass ne $cclass) {
-            $self->{entry}->replace(
-                'objectClass' => [ $self->_my_ldap_classes ]
-            );
+            $self->_update_class();
         }
     }