rpms/crypto-utils/devel genkey.pl,1.16,1.17
Elio Maldonado (emaldonado)
fedora-extras-commits at redhat.com
Tue May 27 16:30:36 UTC 2008
Author: emaldonado
Update of /cvs/extras/rpms/crypto-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25602
Modified Files:
genkey.pl
Log Message:
Updated copyright date, fixed override_key, moved test for key exist after setting of mod_nss variables, removed duplicate window, clear err before invoking command
Index: genkey.pl
===================================================================
RCS file: /cvs/extras/rpms/crypto-utils/devel/genkey.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- genkey.pl 11 May 2008 02:47:51 -0000 1.16
+++ genkey.pl 27 May 2008 16:29:54 -0000 1.17
@@ -50,7 +50,7 @@
Newt::Cls();
Newt::DrawRootText(0, 0,
- "Red Hat Keypair Generation (c) 2007 Red Hat, Inc.");
+ "Red Hat Keypair Generation (c) 2008 Red Hat, Inc.");
if ($help == 1) {
Newt::PushHelpLine(" <Tab>/<Alt-Tab> between elements |" .
@@ -131,7 +131,7 @@
'makeca' => \$ca_mode) or usage();
usage() unless @ARGV != 0;
$skip_random = $test_mode;
-$overwrite_key = $test_mode && !$nss;
+$overwrite_key = $test_mode;
$servername = $ARGV[0];
$randfile = $ssltop."/.rand.".$$;
$tmpPasswordFile = ''; # none has been created yet
@@ -152,22 +152,6 @@
local $SIG{__DIE__} = sub { @err=@_; Newt::Finished(); die @err;};
-#
-# Does the key already exist? don't overwrite
-#
-
-if (!$genreq_mode && -f $keyfile && !$overwrite_key) {
- Newt::newtWinMessage("Error", "Close",
- "You already have a key file for this host in file:\n\n" .
- $keyfile . "\n\n" .
- "This script will not overwrite an existing key.\n" .
- "You will need to remove or rename this file in order to" .
- "generate a new key for this host, then run\n" .
- "\"genkey $servername\"");
- Newt::Finished();
- exit 1;
-}
-
# Either mod_nss or mod_ssl is required
requireModule();
@@ -187,6 +171,23 @@
$nssDBPrefix = getNSSDBPrefix();
}
+#
+# Does the key already exist? don't overwrite
+#
+
+if (!$nss) {
+if (!$genreq_mode && -f $keyfile && !$overwrite_key) {
+ Newt::newtWinMessage("Error", "Close",
+ "You already have a key file for this host in file:\n\n" .
+ $keyfile . "\n\n" .
+ "This script will not overwrite an existing key.\n" .
+ "You will need to remove or rename this file in order to" .
+ "generate a new key for this host, then rerun the command");
+ Newt::Finished();
+ exit 1;
+}
+}
+
######################################################################
# Main
#
@@ -228,7 +229,6 @@
wantCAWindow,
passwordWindow,
genReqWindow,
- genReqWindow,
genCertWindow,
### @EXTRA@ ### Leave this comment here.
);
@@ -849,6 +849,7 @@
Newt::Suspend();
print STDOUT "$cmd $args"."\n";
+ $! = '';
system("$cmd $args");
# change to system("gdb $cmd");
# to break into the debugger
More information about the fedora-extras-commits
mailing list