Changeset 1357 for trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix

Timestamp:

06/25/15 15:38:44 (9 years ago)

Author:

nanardon

Message:

Fix id information into Unix base

Location:

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

Files:

• Group.pm (modified) (3 diffs)
• User.pm (modified) (2 diffs)

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

@@ -58 +58 @@
 sub new {
     my ($class, $base, $id, @args) = @_;
-    # we profit of ref, quite easy
-    if (exists($base->{groups}{$id}) && $base->{groups}{$id}) {
+
+    if (exists($base->{groups}{$id})) {
         if ($base->{groups}{$id}{gid} < ($base->{min_gid} || 0)) {
+            $base->log(LA_DEBUG, "gid %d less than minimal %d", $base->{groups}{$id}{gid}, ($base->{min_gid} || 0));
             return;
         }
         return bless($base->{groups}{$id}, $class);
-    } else { return }
-}
-
-sub id {
-    $_[0]->{group_name}
+    } else {
+        $base->log(LA_ERR, "Cannot find group $id");
+        return
+    }
 }
 
@@ -75 +75 @@
     if ($field eq 'user_list') {
         return [ keys %{ $self->{'users'} || {} } ];
-    } elsif ($field eq 'goup_name') {
+    } elsif ($field eq 'group_name') {
         return $self->id;
     }
@@ -88 +88 @@
             if (!(defined($data{$field}) && $data{$field} =~ /^\d+$/)) {
                 $self->base->log(LA_ERR,
-                    "Invalid data for $field: " . ($data{$field} || ''));
+                    "Invalid Group data for $field: " . (defined($data{$field}) ? $data{$field} : ''));
                 return;
             }

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

@@ -84 +84 @@
 }
 
-sub id {
-    $_[0]->{account}
-}
-
 sub get_field {
     my ($self, $field) = @_;
@@ -115 +111 @@
             if(!(defined($data{$field}) && $data{$field} =~ /^\d+$/)) {
                 $self->base->log(LA_ERR,
-                    "Invalid data for $field: " . ($data{$field} || ''));
+                    "Invalid data for $field: " . (defined($data{$field}) ? $data{$field} : '(none)'));
                 return;
             }