Changeset 434

Timestamp:

09/07/09 13:01:01 (15 years ago)

Author:

nanardon

Message:

• la-crypt-passwd kill show option and make it default action

File:

• LATMOS-Accounts/bin/la-crypt-passwd (modified) (6 diffs)

LATMOS-Accounts/bin/la-crypt-passwd

@@ -15 +15 @@
 =head1 SYNOPSIS
 
-    la-crypt [--genkey|--regen] [--show] [--set BASE]
+    la-crypt [--genkey|--regen] [-m] [--set BASE]
 
 =cut
@@ -25 +25 @@
     'genkey'     => \my $genkey,
     'regen'      => \my $regen,
-    'show'       => \my $show,
     'set=s'      => \my $set,
 ) or pod2usage();
@@ -47 +46 @@
 Like --genkey but a new key will replace the current one if already present.
 Stored password will be read and encrypted again using the new key.
-
-=item --show
-
-Show for each user the password in clear form.
 
 =item --set BASE
@@ -93 +88 @@
 }
 
-if ($show) {
-    if ($LA->_base->get_global_value('rsa_private_key')) {
-        my $clearpasswd = get_clear_password();
-        foreach (keys %$clearpasswd) {
-            printf("%s: %s\n", $_, $clearpasswd->{$_});
-        }
-    } else {
-        warn "No rsa key found in database\n";
-    }
-}
 if ($set) {
     if (!$LA->_base->get_global_value('rsa_private_key')) {
@@ -118 +103 @@
     }
     $destbase->commit;
-}
-
-
-if ($regen || $genkey) {
+} elsif ($regen || $genkey) {
     if ($LA->_base->get_global_value('rsa_private_key') && !$regen) {
         die <<EOF;
@@ -145 +127 @@
     }
     $base->commit;
+} else {
+    if ($LA->_base->get_global_value('rsa_private_key')) {
+        my $clearpasswd = get_clear_password();
+        foreach (keys %$clearpasswd) {
+            printf("%s: %s\n", $_, $clearpasswd->{$_});
+        }
+    } else {
+        warn "No rsa key found in database\n";
+    }
 }