[Pvfs2-cvs] commit by dbonnie in pvfs2/src/apps/admin: pvfs2-genconfig

[CVS commit program]

Update of /anoncvs/pvfs2/src/apps/admin
In directory parlweb1:/tmp/cvs-serv11243/src/apps/admin

Modified Files:
      Tag: cu-security-branch
	pvfs2-genconfig 
Log Message:
Patch from HEAD and fixed a bug in pvfs2-genconfig script.


Index: pvfs2-genconfig
===================================================================
RCS file: /anoncvs/pvfs2/src/apps/admin/pvfs2-genconfig,v
diff -p -u -r1.78.2.2 -r1.78.2.3
--- pvfs2-genconfig	22 May 2008 17:49:59 -0000	1.78.2.2
+++ pvfs2-genconfig	22 May 2008 18:24:02 -0000	1.78.2.3
@@ -799,7 +799,11 @@ sub get_storage
 
 sub get_pubkey
 {
-	if($security_flag eq "")
+	my $pubkey = $dirname . "/keystore";
+    if ($opt_pubkey) {
+        $pubkey = $opt_pubkey;
+    } elsif (!$opt_quiet) {
+        if($security_flag eq "")
 	{
 	    print $OUT "Choose whether or not you compiled with encryption enabled.\n";
         $security_flag = prompt_word("Did you compile with encryption [Default is n]? ","n");
@@ -808,10 +812,6 @@ sub get_pubkey
     {
         return "";
     }
-    my $pubkey = $dirname . "/keystore";
-    if ($opt_pubkey) {
-        $pubkey = $opt_pubkey;
-    } elsif (!$opt_quiet) {
         print $OUT "Choose the location and filename of the public key file.\n";
         $pubkey = prompt_word("Enter public key file location: [Default is " . $dirname . "/keystore]: ",$dirname . "/keystore");
     }