Changeset 178

Timestamp:

05/24/09 17:55:03 (15 years ago)

Author:

nanardon

Message:

• fix cryptmd5 salt
• w/o options sync_access use defaults values

Location:

LATMOS-Accounts/lib/LATMOS

Files:

• Accounts.pm (modified) (1 diff)
• Accounts/Bases/Objects.pm (modified) (1 diff)
• Accounts/SynchAccess/base.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts.pm

@@ -134 +134 @@
     my ($self, $name, %options) = @_;
 
-    my @obases = $name 
-        ? (map { $self->base($_) } ($self->sync_from_name($name), $self->val("sync:$name", 'to')))
-        : map { $self->base($_) } @{ $options{bases} || []};
+    my @obases;
+    if ($name) {
+        @obases =
+        (map { $self->base($_) } ($self->sync_from_name($name), $self->val("sync:$name", 'to')));
+    } elsif(@{ $options{bases} || []}) {
+        @obases = map { $self->base($_) } @{ $options{bases} || []};
+    } elsif (my $sname = $self->default_synchro_name) {
+        @obases = (map { $self->base($_) }
+            ($self->sync_from_name($sname), $self->val("sync:$sname", 'to'))
+        );
+    }
+
     LATMOS::Accounts::SynchAccess->new([ @obases ]);
 }

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

@@ -241 +241 @@
         my @salt_char = (('a' .. 'z'), ('A' .. 'Z'), (0 .. 9), '/', '.');
         my $salt = join('', map { $salt_char[rand(scalar(@salt_char))] } (1 .. 8));
-        $self->set_fields($field, crypt($clear_pass, $salt));
+        $self->set_fields($field, crypt($clear_pass, '$1$' . $salt));
     }
 }

LATMOS-Accounts/lib/LATMOS/Accounts/SynchAccess/base.pm

@@ -10 +10 @@
 sub AUTOLOAD {
     my ($self, @args) = @_;
-    #$AutoLoader::AUTOLOAD or return;
     my ($constname, $sub) = $AUTOLOAD =~ m/(.*)::([^:]+)/;
     $self->_trap_false($sub, @args);