Warnings fixes

diff --git a/webmin/gnupg-lib.pl b/webmin/gnupg-lib.pl
index c547b1b..f1c6b33 100755 (executable)
--- a/webmin/gnupg-lib.pl
+++ b/webmin/gnupg-lib.pl
@@ -12,7 +12,7 @@ if (!$module_name) {
        }
 &foreign_require("proc", "proc-lib.pl");
 
-$gpgpath = $config{'gpg'} || "gpg";
+our $gpgpath = $config{'gpg'} || "gpg";
 
 # list_keys()
 # Returns an array of all GnuPG keys

diff --git a/webmin/setup_ca.cgi b/webmin/setup_ca.cgi
index cce6186..28f0007 100755 (executable)
--- a/webmin/setup_ca.cgi
+++ b/webmin/setup_ca.cgi
@@ -10,7 +10,7 @@ $in{'size_def'} || $in{'size'} =~ /^\d+$/ || &error($text{'newkey_esize'});
 
 &lock_file($ENV{'MINISERV_CONFIG'});
 &get_miniserv_config(\%miniserv);
-&setup_ca() if (!-r $miniserv{'ca'});
+&setup_ca(\%miniserv) if (!-r $miniserv{'ca'});
 &lock_file($miniserv{'ca'});
 $ctemp = &transname();
 $ktemp = &transname();