Changeset 1706 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Timestamp:

02/03/16 05:39:24 (8 years ago)

Author:

nanardon

Message:

Revert "Add to cn both id and "real name" on ldap base"

Break the object list

This reverts commit bf29be25c0c7b7bc87de06fe3be42eab2a6b3a56.

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Ldap/User.pm (modified) (3 diffs)

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

@@ -43 +43 @@
 
 sub _key_attr { 'cn' } 
-
-sub _key_attribute {
-    my ($self, $base) = @_;
-    $base ||= $self->base;
-
-    $base->config($self->type . '_key_attribute') || 'uid';
-}
 
 sub _my_ldap_classes { qw(
@@ -173 +166 @@
     $entry->replace(objectClass =>
         [ $class->_my_ldap_classes ],);
-    $data{cn} ||= [ grep { $_ }
-        join(' ', $data{givenName},$data{sn}),
-        $id
-    ]; # cn is mandatory
+    $data{cn} ||= $data{sn} || $id; # cn is mandatory
     $data{sn} ||= $id; # sn is mandatory
     $data{uid} ||= $id; # uid is mandatory
@@ -230 +220 @@
     };
     $self->SUPER::get_field($field);
-}
-
-sub set_fields {
-    my ($self, %fields) = @_;
-
-    if (exists($fields{givenName}) || exists($fields{sn})) {
-        my $gn = $fields{givename} || $self->_get_attributes('givenName');
-        my $sn = $fields{sn} || $self->_get_attributes('sn');
-        my @cn = grep { $_ } (
-            join(' ', $gn, $sn),
-            $self->id);
-        $self->_populate_entry($self->{entry}, 'cn', \@cn);
-    }
-
-    $self->SUPER::set_fields(%fields);
 }