Changeset 1975

Timestamp:

03/17/17 18:36:11 (7 years ago)

Author:

nanardon

Message:

Fix internal attribute name discovery for Unix db

Location:

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

Files:

• Unix.pm (modified) (2 diffs)
• Unix/Group.pm (modified) (1 diff)
• Unix/User.pm (modified) (2 diffs)

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

@@ -361 +361 @@
 
 sub create_object {
-    my ($self, $otype, $id, %data) = @_;
+    my ($self, $otype, $id, %gdata) = @_;
+
+    my %data;
+
+    foreach my $attr (keys %gdata) {
+        if (my $oattr = $self->attribute($otype, $attr)) {
+            $data{ $oattr->iname } = $gdata{$attr};
+        } else {
+            $data{$attr} = $gdata{$attr};
+        }   
+    }
 
     # objects are store into sub ref:
@@ -374 +384 @@
         }
         if(/^group$/ && !defined($data{gid})) {
-            $self->log(LA_ERR, "uid or gid missing to create $otype");
+            $self->log(LA_ERR, "gid missing to create $otype");
             return;
         }

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix/Group.pm

@@ -83 +83 @@
 
 sub set_fields {
-    my ($self, %data) = @_;
+    my ($self, %gdata) = @_;
+
+    my %data;
+
+    foreach my $attr (keys %gdata) {
+        if (my $oattr = $self->attribute($attr)) {
+            $data{ $oattr->iname } = $gdata{$attr};
+        } else {
+            $data{$attr} = $gdata{$attr};
+        }   
+    }
+
     foreach my $field (keys %data) {
         $field eq 'gid' and do {

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

@@ -54 +54 @@
         givenName       => { ro => 1 },
         sn              => { ro => 1 },
-        uid             => { iname => 'login', ro => 1 },
         sAMAccountName  => { iname => 'login', ro => 1 },
         $base->{use_shadow} ?
@@ -106 +105 @@
 
 sub set_fields {
-    my ($self, %data) = @_;
+    my ($self, %gdata) = @_;
+
+    my %data;
+
+    foreach my $attr (keys %gdata) {
+        if (my $oattr = $self->attribute($attr)) {
+            $data{ $oattr->iname } = $gdata{$attr};
+        } else {
+            $data{$attr} = $gdata{$attr};
+        }
+    }
+
     foreach my $field (keys %data) {
         $field =~ /^(uid|gid)$/ and do {