Changeset 48 for LATMOS-Accounts/lib/LATMOS

Timestamp:

04/25/09 12:58:30 (15 years ago)

Author:

nanardon

Message:

• support sn and givenName

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

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

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

@@ -79 +79 @@
             homeDirectory   => 'home',
             loginShell      => 'shell',
+            sn              => 'name',
+            givenName       => 'firstname',
             #userPassword    => ($self->{use_shadow} ? 'spassword' : 'password'),
         },

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

@@ -65 +65 @@
             loginShell      => 'shell',
             userPassword    => ($self->{use_shadow} ? 'spassword' : 'password'),
+            givenName       => 'givenName',
+            sn              => 'sn',
         },
         group => {
@@ -116 +118 @@
         sub {
             my @ch = @_;
-            my $user = $ch[0];
+            my $user = $ch[0] or return;
             # TODO add check ?
             foreach (@password_fields) {

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

@@ -47 +47 @@
 sub get_field {
     my ($self, $field) = @_;
+    for ($field) {
+        /^(sn|givenName)$/ and do {
+            my $gecos = $self->{gecos} || '';
+            my ($given, $sn) = $gecos =~ /^([^, ]+) +([^, ]+)/;
+            return $field eq 'sn' ? $sn : $given;
+        };
+    }
     $self->{$field}
 }