Changeset 861 for LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix.pm

Timestamp:

12/02/11 11:42:17 (13 years ago)

Author:

nanardon

Message:

• reimport missing files from previous svn

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Unix.pm (modified) (3 diffs)

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

@@ -43 +43 @@
     
     my $base = {
-        passwd =>  $options{passwd} || '/etc/passwd',
-        shadow =>  $options{shadow} || '/etc/shadow',
-        group =>   $options{group} || '/etc/group',
-        gshadow => $options{gshadow} || '/etc/gshadow',
         # are we using shadow, default to yes
         use_shadow => (defined($options{use_shadow}) ? $options{use_shadow} : 1),
@@ -56 +52 @@
     };
 
+    foreach (qw(passwd shadow group gshadow)) {
+        if ($options{$_}) {
+            $base->{$_} = $options{$_};
+        } elsif ($options{directory}) {
+            $base->{$_} = $options{directory} . '/' . $_;
+        } else {
+            $base->{$_} = "/etc/$_";
+        }
+    }
+
+
     bless($base, $class);
-}
-
-sub _canonicals_fields {
-    my ($self, $type, $for) = @_;
-    $type = lc($type);
-    {
-        user => {
-            uidNumber       => 'uid',
-            gidNumber       => 'gid',
-            gecos           => 'gecos',
-            homeDirectory   => 'home',
-            loginShell      => 'shell',
-            userPassword    => ($self->{use_shadow} ? 'spassword' : 'password'),
-            memberOf        => 'memberOf',
-            locked          => 'locked',
-            ($for !~ /w/ ? (
-            givenName       => 'givenName',
-            sn              => 'sn',
-            uid             => 'login',
-            sAMAccountName  => 'login',
-            ) : ()),
-            $self->{use_shadow} ?
-            (
-            shadowLastChange => 'last_changed',
-            shadowMin       => 'before_ch',
-            shadowMax       => 'after_ch',
-            shadowWarning   => 'exp_warn',
-            shadowInactive  => 'exp_disable',
-            shadowExpire    => 'disable',
-            shadowFlag      => 'res',
-            ) : (), 
-            # description => not supported
-        },
-        group => {
-            ($for !~ /w/ ? (
-            sAMAccountName  => 'group_name',
-            ) : ()),
-            gidNumber       => 'gid',
-            memberUID       => 'user_list',
-        },
-    }->{$type}
-}
-
-sub list_canonical_fields {
-    my ($self, $type, $for) = @_;
-    $for ||= 'rw';
-    keys %{ $self->_canonicals_fields($type, $for) || {} }
-}
-
-sub get_field_name {
-    my ($self, $type, $cfield, $for) = @_;
-    $for ||= 'rw';
-    ($self->_canonicals_fields($type, $for) || {})->{$cfield}
 }
 
@@ -248 +202 @@
     truncate($handle, 0);
     foreach my $line (@data) {
-        print $handle join(':', map { defined($_) ? $_ : '' } @$line) . "\n";
+        print $handle join(':', map { my $f = $_; $f =~ s/:/;/g; $f } map { defined($_) ? $_ : '' } @$line) . "\n";
     }
     close($handle);