diff -Naur cmds.orig/advanced_csr cmds/advanced_csr
--- cmds.orig/advanced_csr	2011-02-14 22:45:41.000000000 +0100
+++ cmds/advanced_csr	2013-12-17 20:56:31.549865946 +0100
@@ -810,6 +810,8 @@
 	my $checkVal = checkRequirements( $req, $LOA, $query->param('genkey') );
 
 	if( $checkVal ne "OK" ) {
+		our ($DEBUG);
+
 		# ERROR: The request does not match the requirements
 		# for the used LOA
 		if( $DEBUG ) {
diff -Naur cmds.orig/authenticated_csr cmds/authenticated_csr
--- cmds.orig/authenticated_csr	2011-02-14 22:45:41.000000000 +0100
+++ cmds/authenticated_csr	2013-12-17 21:06:10.431549996 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $errval);
+
 ## holds the type of the request
 our $type;
 our $os;
diff -Naur cmds.orig/crlList cmds/crlList
--- cmds.orig/crlList	2010-02-19 00:53:13.000000000 +0100
+++ cmds/crlList	2013-12-17 21:10:14.168692753 +0100
@@ -12,7 +12,7 @@
 
 sub cmdCrlList {
 
-our ($query, $db, $self);
+our ($query, $db, $self, $cryptoShell);
 
 ## Reserved variables
 my ( $page, $dataType, $crlData, $oldDataType );
diff -Naur cmds.orig/genCACert cmds/genCACert
--- cmds.orig/genCACert	2010-02-23 02:33:53.000000000 +0100
+++ cmds/genCACert	2013-12-17 21:27:53.845400080 +0100
@@ -185,6 +185,8 @@
 sub getParamsGenCACert
 {
 
+    our ($query);
+
     my $result = "";
 
     if (not $_[0]) ## 0 or empty
diff -Naur cmds.orig/genCRL cmds/genCRL
--- cmds.orig/genCRL	2011-02-13 21:51:32.000000000 +0100
+++ cmds/genCRL	2013-12-17 20:39:55.262767112 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($crypto_layer, $query, $db, $tools);
+
 sub cmdGenCRL {
 
 ## This function exports the CRL in DER format (preferred
@@ -181,6 +183,8 @@
 sub getParamsGenCRL
 {
 
+    our ($query);
+
     my $result = "";
 
     if (not $_[0]) ## 0 or empty
diff -Naur cmds.orig/genCRLfromFile cmds/genCRLfromFile
--- cmds.orig/genCRLfromFile	2013-12-17 17:39:02.257521906 +0100
+++ cmds/genCRLfromFile	2013-12-17 21:14:27.816914053 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($crypto_layer, $query, $db, $tools);
+				  
 sub cmdGenCRLfromFile {
 
 ## This function exports the CRL in DER format (preferred
diff -Naur cmds.orig/genMenu cmds/genMenu
--- cmds.orig/genMenu	2007-11-07 20:53:37.000000000 +0100
+++ cmds/genMenu	2013-12-17 21:28:43.612739584 +0100
@@ -12,6 +12,8 @@
 
 sub cmdGenMenu {
 
+	our ($query, $xml_cache);
+
 	my $iface 	= getRequired ('CgiServerName');
 	my $on 		= ($query->param('on') or "1");
 	my $root	= "interface_menus";
@@ -111,6 +113,8 @@
 }
 
 sub buildMenuRow {
+    our ($xml_cache);
+
     my $keys = { @_ };
 
     my $xpath      = $keys->{XPATH};
@@ -232,6 +236,8 @@
 }
 
 sub recursivePath {
+	our ($xml_cache);
+
 	my $keys = { @_ };
 	my $menu = 0;
 	my $subitems = 0;
@@ -278,6 +284,8 @@
 }
 
 sub recur {
+	our ($xml_cache);
+
 	my $keys = { @_ };
 	my $ret = "";
 
diff -Naur cmds.orig/getParams cmds/getParams
--- cmds.orig/getParams	2012-04-08 02:14:49.000000000 +0200
+++ cmds/getParams	2013-12-17 21:30:04.641152473 +0100
@@ -15,6 +15,8 @@
 
 sub cmdGetParams
 {
+	our ($query);
+
 	## get basic data and information
 	my $cmd   = $query->param ('GET_PARAMS_CMD');
 
diff -Naur cmds.orig/getStaticPage cmds/getStaticPage
--- cmds.orig/getStaticPage	2011-02-14 22:45:41.000000000 +0100
+++ cmds/getStaticPage	2013-12-17 21:31:18.402246284 +0100
@@ -541,6 +541,8 @@
                                gettext ("CRL in text format").
                                '</a>';
     } elsif ($pageName =~ /homePage/) {
+	our ($self, $session);
+
         $name = gettext ("Home Page");
 	my $pos = 0;
 
diff -Naur cmds.orig/hsmLogin cmds/hsmLogin
--- cmds.orig/hsmLogin	2007-11-07 20:53:38.000000000 +0100
+++ cmds/hsmLogin	2013-12-17 21:32:37.326847653 +0100
@@ -11,7 +11,7 @@
 
 sub cmdHsmLogin {
 
-
+	our ($crypto_layer);
 
 	print startLogPage (gettext("Login to hardware security module"));
 
diff -Naur cmds.orig/hsmLogout cmds/hsmLogout
--- cmds.orig/hsmLogout	2007-11-07 20:53:36.000000000 +0100
+++ cmds/hsmLogout	2013-12-17 21:33:06.264124605 +0100
@@ -11,7 +11,7 @@
 
 sub cmdHsmLogout {
 
-
+	our ($crypto_layer);
 
  	print startLogPage (gettext("Logout from hardware security modules in daemon mode"));
 
diff -Naur cmds.orig/importCACert cmds/importCACert
--- cmds.orig/importCACert	2007-11-07 20:53:38.000000000 +0100
+++ cmds/importCACert	2013-12-17 20:41:43.196698730 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $tools, $cryptoShell, $db);
+
 sub cmdImportCACert {
 
 ## To import the CA certificate we use the same import device as the
diff -Naur cmds.orig/issueCertificate cmds/issueCertificate
--- cmds.orig/issueCertificate	2008-09-25 05:35:23.000000000 +0200
+++ cmds/issueCertificate	2013-12-17 20:41:55.023595583 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query);
+
 sub cmdIssueCertificate {
 
 	## Get the parameters
diff -Naur cmds.orig/ldapAddCert cmds/ldapAddCert
--- cmds.orig/ldapAddCert	2007-11-07 20:53:38.000000000 +0100
+++ cmds/ldapAddCert	2013-12-17 20:42:02.238922523 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $db);
+
 sub cmdLdapAddCert { 
 
 ## certificates
diff -Naur cmds.orig/ldapAddCertByName cmds/ldapAddCertByName
--- cmds.orig/ldapAddCertByName	2007-11-07 20:53:35.000000000 +0100
+++ cmds/ldapAddCertByName	2013-12-17 20:42:11.118094251 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $db);
+
 sub cmdLdapAddCertByName {
 
 ## certificates
diff -Naur cmds.orig/ldapAddCerts cmds/ldapAddCerts
--- cmds.orig/ldapAddCerts	2007-11-07 20:53:38.000000000 +0100
+++ cmds/ldapAddCerts	2013-12-17 20:42:17.525496619 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($db);
+
 sub cmdLdapAddCerts {
 
 ## ca-certificates
diff -Naur cmds.orig/ldapAddCRL cmds/ldapAddCRL
--- cmds.orig/ldapAddCRL	2010-02-23 02:33:53.000000000 +0100
+++ cmds/ldapAddCRL	2013-12-17 20:42:25.004798728 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $db);
+
 sub cmdLdapAddCRL {
 
 print startLogPage ( gettext ("Updating the CRL on the LDAP ..."));
diff -Naur cmds.orig/ldapAddCRLbyName cmds/ldapAddCRLbyName
--- cmds.orig/ldapAddCRLbyName	2010-02-23 02:33:53.000000000 +0100
+++ cmds/ldapAddCRLbyName	2013-12-17 20:42:33.823976039 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $db);
+
 sub cmdLdapAddCRLbyName {
 
 print startLogPage ( gettext ("Updating the CRL on the LDAP ..."));
diff -Naur cmds.orig/ldapImportCerts cmds/ldapImportCerts
--- cmds.orig/ldapImportCerts	2007-11-07 20:53:38.000000000 +0100
+++ cmds/ldapImportCerts	2013-12-17 20:42:40.231378757 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($tools, $db);
+
 sub cmdLdapImportCerts {
 
 my ( $ldap, $result, @certsList, $cert, $parsed, $dn, $mesg, $tmp);
diff -Naur cmds.orig/ldapUpdateCA cmds/ldapUpdateCA
--- cmds.orig/ldapUpdateCA	2007-11-07 20:53:36.000000000 +0100
+++ cmds/ldapUpdateCA	2013-12-17 20:42:53.922101931 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($db);
+
 sub cmdLdapUpdateCA {
 
 	my $dn = getRequired ('LDAP_CA_DN');
diff -Naur cmds.orig/listCSR cmds/listCSR
--- cmds.orig/listCSR	2010-12-13 21:06:06.000000000 +0100
+++ cmds/listCSR	2013-12-17 20:43:06.832897475 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($cryptoShell);
+
 sub cmdListCSR {
 
     our ($query, $db, $self);
diff -Naur cmds.orig/new_module cmds/new_module
--- cmds.orig/new_module	2007-11-07 20:53:38.000000000 +0100
+++ cmds/new_module	2013-12-17 20:43:21.335544847 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query);
+
 sub cmdNew_module {
 
     my $twig = loadConfigXML ('ModuleConfiguration');
diff -Naur cmds.orig/new_right cmds/new_right
--- cmds.orig/new_right	2007-11-07 20:53:36.000000000 +0100
+++ cmds/new_right	2013-12-17 20:43:28.790849406 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($access_control, $query);
+
 sub cmdNew_right {
 
     my $twig = $access_control->{twig_acl};
diff -Naur cmds.orig/new_role cmds/new_role
--- cmds.orig/new_role	2007-11-07 20:53:38.000000000 +0100
+++ cmds/new_role	2013-12-17 21:35:04.920959331 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdNew_role {
+    our ($query);
 
     ## get the new rolename
     my $role = $query->param ('role');
@@ -67,6 +68,7 @@
 }
 
 sub checkNew_role {
+    our ($query);
 
     ## get the new rolename
     my $role = $query->param ('role');
diff -Naur cmds.orig/rebuildChain cmds/rebuildChain
--- cmds.orig/rebuildChain	2007-11-07 20:53:37.000000000 +0100
+++ cmds/rebuildChain	2013-12-17 20:43:56.284285123 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($cmd);
+
 sub cmdRebuildChain {
 
 	my $chainDir   = getRequired( 'ChainDir' );
diff -Naur cmds.orig/rebuildOpenSSLindexDB cmds/rebuildOpenSSLindexDB
--- cmds.orig/rebuildOpenSSLindexDB	2007-11-07 20:53:36.000000000 +0100
+++ cmds/rebuildOpenSSLindexDB	2013-12-17 20:44:05.155457741 +0100
@@ -10,6 +10,8 @@
 use strict;
 use File::Spec;
 
+our ($tools);
+
 sub cmdRebuildOpenSSLindexDB {
 
 print startLogPage (gettext ("Try to recover OpenSSL's index database"));
diff -Naur cmds.orig/removeFiles cmds/removeFiles
--- cmds.orig/removeFiles	2007-11-07 20:53:38.000000000 +0100
+++ cmds/removeFiles	2013-12-17 20:44:16.066440260 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($tools);
+
 sub cmdRemoveFiles {
 
 	my $ret;
diff -Naur cmds.orig/removeKey cmds/removeKey
--- cmds.orig/removeKey	2010-02-21 21:11:43.000000000 +0100
+++ cmds/removeKey	2013-12-17 20:44:28.361293378 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query, $db, $cryptoShell);
+
 sub cmdRemoveKey {
 
 	## Check FORM : try to identify if the form has already been
diff -Naur cmds.orig/renewCSR cmds/renewCSR
--- cmds.orig/renewCSR	2010-02-23 02:33:53.000000000 +0100
+++ cmds/renewCSR	2013-12-17 20:44:37.076480436 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query, $db, $tools, $cryptoShell);
+
 sub cmdRenewCSR {
 
 ## To aprove a Request, we need it signed by the RA operator
diff -Naur cmds.orig/revokeCertificate cmds/revokeCertificate
--- cmds.orig/revokeCertificate	2008-03-27 04:07:23.000000000 +0100
+++ cmds/revokeCertificate	2013-12-17 20:44:46.195629980 +0100
@@ -11,6 +11,8 @@
 
 use strict;
 
+our ($query, $errval, $errno);
+
 sub cmdRevokeCertificate {
 
 	my $cert = libRevokeCertificate(
diff -Naur cmds.orig/revoke_req cmds/revoke_req
--- cmds.orig/revoke_req	2008-09-25 05:35:23.000000000 +0200
+++ cmds/revoke_req	2013-12-17 20:44:54.670839662 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query);
+
 sub cmdRevoke_req {
 
 	## try to determine a serial
diff -Naur cmds.orig/scepGetCACert cmds/scepGetCACert
--- cmds.orig/scepGetCACert	2007-11-07 20:53:38.000000000 +0100
+++ cmds/scepGetCACert	2013-12-17 20:45:02.370121605 +0100
@@ -11,6 +11,8 @@
 
 use strict;
 
+our ($query, $cryptoShell, $tools);
+
 sub cmdScepGetCACert {
 
   my ( $operation, $message, $cert );
diff -Naur cmds.orig/search cmds/search
--- cmds.orig/search	2010-02-19 00:53:13.000000000 +0100
+++ cmds/search	2013-12-17 20:45:11.649256213 +0100
@@ -10,6 +10,7 @@
 
 use strict;
 
+our ($query, $log, $db);
 
 sub cmdSearch {
 
diff -Naur cmds.orig/search_rights cmds/search_rights
--- cmds.orig/search_rights	2007-11-07 20:53:37.000000000 +0100
+++ cmds/search_rights	2013-12-17 22:21:40.226135522 +0100
@@ -18,7 +18,7 @@
 my $role;
 
 ## load modules
-my %values = loadModules;
+my %values = "loadModules";
 $module = "<select name=module>\n";
 $module .= "<option value=\"\">\n";
 for my $h (keys %values) {
@@ -27,7 +27,7 @@
 $module .= "</select>\n";
 
 ## load operations
-my @values = loadOperations;
+my @values = "loadOperations";
 $operation = "<select name=operation>\n";
 $operation .= "<option value=\"\">\n";
 for my $h (@values) {
@@ -36,7 +36,7 @@
 $operation .= "</select>\n";
 
 ## load operator and owner from roles
-@values = loadRoles;
+@values = "loadRoles";
 my $operator = "<select name=role>\n";
 my $owner    = "<select name=owner>\n";
 $operator .= "<option value=\"\">".gettext ("&lt;new user&gt;")."\n";
diff -Naur cmds.orig/send_cert_key cmds/send_cert_key
--- cmds.orig/send_cert_key	2007-11-07 20:53:37.000000000 +0100
+++ cmds/send_cert_key	2013-12-17 20:45:38.278772747 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query);
+
 sub cmdSend_cert_key {
 
 	libCheckPasswd ("PUBLIC");
diff -Naur cmds.orig/send_cert_key_openssl cmds/send_cert_key_openssl
--- cmds.orig/send_cert_key_openssl	2013-12-17 20:19:09.146968975 +0100
+++ cmds/send_cert_key_openssl	2013-12-17 20:45:46.458009972 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query, $db, $cryptoShell);
+
 sub cmdSend_cert_key_openssl {
 
 	libCheckPasswd ("PUBLIC");
diff -Naur cmds.orig/send_cert_key_pkcs12 cmds/send_cert_key_pkcs12
--- cmds.orig/send_cert_key_pkcs12	2010-02-21 22:01:52.000000000 +0100
+++ cmds/send_cert_key_pkcs12	2013-12-17 20:45:54.737237835 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query, $db, $tools, $cryptoShell);
+
 sub cmdSend_cert_key_pkcs12 {
 
 	libCheckPasswd ("PUBLIC");
diff -Naur cmds.orig/send_cert_key_pkcs8 cmds/send_cert_key_pkcs8
--- cmds.orig/send_cert_key_pkcs8	2010-02-21 22:01:53.000000000 +0100
+++ cmds/send_cert_key_pkcs8	2013-12-17 20:46:02.332529535 +0100
@@ -10,6 +10,8 @@
 
 use strict;
 
+our ($query, $db);
+
 sub cmdSend_cert_key_pkcs8 {
 
 	libCheckPasswd ("PUBLIC");
diff -Naur cmds.orig/sendCRINMail cmds/sendCRINMail
--- cmds.orig/sendCRINMail	2007-11-07 20:53:35.000000000 +0100
+++ cmds/sendCRINMail	2013-12-17 20:45:22.004290665 +0100
@@ -8,6 +8,8 @@
 
 use strict;
 
+our ($query, $errno);
+
 sub cmdSendCRINMail {
 
 	print startLogPage ( gettext ("Sending CRIN-Mail(s) ...") );
diff -Naur cmds.orig/send_email_cert cmds/send_email_cert
--- cmds.orig/send_email_cert	2010-02-22 20:57:23.000000000 +0100
+++ cmds/send_email_cert	2013-12-17 20:57:39.547485797 +0100
@@ -11,6 +11,7 @@
 use strict;
 
 sub cmdSend_email_cert {
+	our ($VER, $PRG, $query, $db);
 
 	## Version Information
 	$VER = '2.1.01';
diff -Naur cmds.orig/sendMail cmds/sendMail
--- cmds.orig/sendMail	2007-11-07 20:53:38.000000000 +0100
+++ cmds/sendMail	2013-12-17 20:45:28.303702994 +0100
@@ -9,6 +9,8 @@
 
 use strict;
 
+our ($query);
+
 sub cmdSendMail {
 
 print startLogPage( gettext("E-Mail Sending Page") );
diff -Naur cmds.orig/setLanguage cmds/setLanguage
--- cmds.orig/setLanguage	2008-09-07 00:26:07.000000000 +0200
+++ cmds/setLanguage	2013-12-17 21:03:07.248733466 +0100
@@ -12,6 +12,8 @@
 
 sub cmdSetLanguage {
 
+    our ($session, $query);
+
     $session->setParam ('PREFERENCES_LANGUAGE', $query->param ('lang'));
     if ($query->param ('charset'))
     {
diff -Naur cmds.orig/setPasswd cmds/setPasswd
--- cmds.orig/setPasswd	2007-11-07 20:53:36.000000000 +0100
+++ cmds/setPasswd	2013-12-17 21:36:22.861626660 +0100
@@ -13,6 +13,7 @@
 our ($DATATYPE);
 
 sub cmdSetPasswd {
+	our ($query, $db, $cryptoShell);
 
 	## Status of FORM, possible values (in this order):
 	my $KEY         = $query->param('key');
diff -Naur cmds.orig/setupInitialCert cmds/setupInitialCert
--- cmds.orig/setupInitialCert	2008-08-16 01:12:08.000000000 +0200
+++ cmds/setupInitialCert	2013-12-17 21:37:30.355277344 +0100
@@ -11,6 +11,7 @@
 use strict;
 
 sub cmdSetupInitialCert {
+    our ($query);
 
     my $tmpObj = undef;
     my $datatype = undef;
diff -Naur cmds.orig/show_modules cmds/show_modules
--- cmds.orig/show_modules	2007-11-07 20:53:38.000000000 +0100
+++ cmds/show_modules	2013-12-17 21:39:48.162315673 +0100
@@ -11,6 +11,8 @@
 
 sub cmdShow_modules {
 
+our ($self);
+
 my %values = loadModules ();
 
 my $item_list = undef;
diff -Naur cmds.orig/show_prepared_module cmds/show_prepared_module
--- cmds.orig/show_prepared_module	2007-11-07 20:53:37.000000000 +0100
+++ cmds/show_prepared_module	2013-12-17 21:40:47.868699475 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdShow_prepared_module {
+	our ($query);
 
 	my $id = $query->param ('id');
         my $description = $query->param ('description');
diff -Naur cmds.orig/show_prepared_right cmds/show_prepared_right
--- cmds.orig/show_prepared_right	2007-11-07 20:53:38.000000000 +0100
+++ cmds/show_prepared_right	2013-12-17 21:41:35.772195332 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdShow_prepared_right {
+	our ($query);
 
 	## load form-data
 	my $module    = $query->param ('module');
diff -Naur cmds.orig/show_prepared_role cmds/show_prepared_role
--- cmds.orig/show_prepared_role	2007-11-07 20:53:37.000000000 +0100
+++ cmds/show_prepared_role	2013-12-17 21:42:30.855015874 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdShow_prepared_role {
+	our ($query, $self);
 
 	checkNew_role ();
 
diff -Naur cmds.orig/show_rights cmds/show_rights
--- cmds.orig/show_rights	2007-11-07 20:53:35.000000000 +0100
+++ cmds/show_rights	2013-12-17 22:23:27.468066924 +0100
@@ -13,6 +13,8 @@
 
 sub cmdShow_rights {
 
+our($query, $self);
+
 ## load the parameters
 my $module_filter    = $query->param ('module');
 my $role_filter      = $query->param ('role');
@@ -20,7 +22,7 @@
 my $owner_filter     = $query->param ('owner');
 
 ## load the configuration
-my @acl = loadACL;
+my @acl = "loadACL";
 
 ## prepare filter
 $module_filter    = ".*" if (not $module_filter);
diff -Naur cmds.orig/signConfig cmds/signConfig
--- cmds.orig/signConfig	2007-11-07 20:53:35.000000000 +0100
+++ cmds/signConfig	2013-12-17 21:44:39.854888185 +0100
@@ -10,6 +10,8 @@
 
 sub cmdSignConfig {
 
+our ($query, $self, $cryptoShell);
+
 print startLogPage ( gettext("Signing the hole configuration of the Role Based Access Control ...") );
 
 ## check for passphrase
diff -Naur cmds.orig/startAutoCA cmds/startAutoCA
--- cmds.orig/startAutoCA	2013-10-17 00:14:29.000000000 +0200
+++ cmds/startAutoCA	2013-12-17 22:44:06.527782191 +0100
@@ -63,6 +63,8 @@
 
 sub AutoCaDaemon
 {
+	our ($DEBUG);
+
 	my $func_params = { @_ };
 	my $ca_token = undef;
 	my $crypto_shell = undef;
@@ -420,7 +422,7 @@
 
 sub getParamsStartAutoCA
 {
-	our ($query, $DEBUG, $self);
+	our ($query, $DEBUG, $self, %AUTOCONF);
 	my $result = undef;
 	my $pidfile = $AUTOCONF{"var_prefix"}."/tmp/openca_autoca.pid";
 	my $status = libGetPidProcessStatus ( $pidfile );
diff -Naur cmds.orig/startAutoCRL cmds/startAutoCRL
--- cmds.orig/startAutoCRL	2013-10-17 00:14:29.000000000 +0200
+++ cmds/startAutoCRL	2013-12-17 22:57:21.001247676 +0100
@@ -60,6 +60,8 @@
 
 sub	AutoCrlDaemon
 {
+	our ($DEBUG);
+
 	my $func_params = { @_ };
 	my $ca_token = undef;
 	my $crypto_shell = undef;
@@ -198,7 +200,8 @@
     my $func_params	 = { @_ };
 		my $params = undef;
 
-    our ($crlDB, $query, $errno, $errval, $ca_token, $DEBUG);
+    our ($crlDB, $query, $errno, $errval, $ca_token, $DEBUG, $cryptoShell,
+         $tools);
 
     my ($request, $operator_cert, $operator_serial, $signature,
         $role_sig, $cert);
@@ -445,7 +448,7 @@
 
 sub getParamsStartAutoCRL 
 {
-	our ($query, $DEBUG);
+	our ($query, $DEBUG, %AUTOCONF);
 
 	my $result = "";
 
diff -Naur cmds.orig/startAutoRevoke cmds/startAutoRevoke
--- cmds.orig/startAutoRevoke	2013-10-17 00:14:29.000000000 +0200
+++ cmds/startAutoRevoke	2013-12-17 22:48:51.305060862 +0100
@@ -63,6 +63,8 @@
 
 sub AutoRevokeDaemon
 {
+	our ($DEBUG);
+
 	my $func_params = { @_ };
 	my $ca_token = undef;
 	my $crypto_shell = undef;
@@ -429,7 +431,7 @@
 
 sub getParamsStartAutoRevoke
 {
-	our ($query, $DEBUG, $self);
+	our ($query, $DEBUG, $self, %AUTOCONF);
 	my $result = undef;
 
 	my $pidfile = $AUTOCONF{"var_prefix"}."/tmp/openca_autorevoke.pid";
diff -Naur cmds.orig/stats cmds/stats
--- cmds.orig/stats	2010-01-30 04:23:25.000000000 +0100
+++ cmds/stats	2013-12-17 21:45:29.866185161 +0100
@@ -12,6 +12,8 @@
 
 sub cmdStats {
 
+	our ($query);
+
 	my $pid = undef;
 	my $status = undef;
 	my $pidfile = undef;
diff -Naur cmds.orig/statusAutoCA cmds/statusAutoCA
--- cmds.orig/statusAutoCA	2012-04-06 11:41:05.000000000 +0200
+++ cmds/statusAutoCA	2013-12-17 22:41:55.204104446 +0100
@@ -19,7 +19,7 @@
 	my @stats = ();
 	my @stats2 = ();
 
-	our ($DEBUG);
+	our ($DEBUG, %AUTOCONF);
 
 	$pidfile = $AUTOCONF{"var_prefix"}."/tmp/openca_autoca.pid";
 	if (libGetPidProcessStatus($pidfile))
diff -Naur cmds.orig/statusAutoCRL cmds/statusAutoCRL
--- cmds.orig/statusAutoCRL	2012-04-06 11:41:05.000000000 +0200
+++ cmds/statusAutoCRL	2013-12-17 22:53:17.488088450 +0100
@@ -21,7 +21,7 @@
 
 	my $params = undef;
 
-	our ( $DEBUG );
+	our ( $DEBUG, %AUTOCONF );
 
 	$pidfile = $AUTOCONF{"var_prefix"}."/tmp/openca_autocrl.pid";
 	if (libGetPidProcessStatus($pidfile))
diff -Naur cmds.orig/statusAutoEmail cmds/statusAutoEmail
--- cmds.orig/statusAutoEmail	2012-04-08 02:30:42.000000000 +0200
+++ cmds/statusAutoEmail	2013-12-17 22:50:25.260245929 +0100
@@ -11,6 +11,8 @@
 
 sub cmdStatusAutoEmail {
 
+	our (%AUTOCONF);
+
 	my $pidfile = undef;
 	my $pid = undef;
 	my $info_list = undef;
diff -Naur cmds.orig/statusAutoRevoke cmds/statusAutoRevoke
--- cmds.orig/statusAutoRevoke	2012-04-06 11:41:05.000000000 +0200
+++ cmds/statusAutoRevoke	2013-12-17 22:46:15.219706078 +0100
@@ -19,7 +19,7 @@
 	my @stats = ();
 	my @stats2 = ();
 
-	our ($DEBUG);
+	our ($DEBUG, %AUTOCONF);
 
 	$pidfile = $AUTOCONF{"var_prefix"}."/tmp/openca_autorevoke.pid";
 	if (libGetPidProcessStatus($pidfile))
diff -Naur cmds.orig/stopAutoCA cmds/stopAutoCA
--- cmds.orig/stopAutoCA	2012-04-06 11:41:05.000000000 +0200
+++ cmds/stopAutoCA	2013-12-17 22:45:23.604549374 +0100
@@ -11,6 +11,8 @@
 
 sub cmdStopAutoCA
 {
+	our (%AUTOCONF);
+
 	my $pidfile = undef;
 	my $pid = undef;
 
diff -Naur cmds.orig/stopAutoCRL cmds/stopAutoCRL
--- cmds.orig/stopAutoCRL	2012-04-06 11:41:05.000000000 +0200
+++ cmds/stopAutoCRL	2013-12-17 22:57:58.293749672 +0100
@@ -12,6 +12,8 @@
 
 sub cmdStopAutoCRL {
 
+	our (%AUTOCONF);
+
 	my $pidfile = undef;
 	my $pid = undef;
 
diff -Naur cmds.orig/stopAutoEmail cmds/stopAutoEmail
--- cmds.orig/stopAutoEmail	2008-09-25 05:35:24.000000000 +0200
+++ cmds/stopAutoEmail	2013-12-17 22:52:10.414381065 +0100
@@ -11,6 +11,7 @@
 use strict;
 
 sub cmdStopAutoEmail {
+	our (%AUTOCONF, $query);
 
 	my $pidfile = undef;
 	my $pid = undef;
diff -Naur cmds.orig/stopAutoRevoke cmds/stopAutoRevoke
--- cmds.orig/stopAutoRevoke	2012-04-06 11:41:05.000000000 +0200
+++ cmds/stopAutoRevoke	2013-12-17 22:49:42.588249565 +0100
@@ -11,6 +11,8 @@
 
 sub cmdStopAutoRevoke 
 {
+	our (%AUTOCONF);
+
 	my $pidfile = undef;
 	my $pid = undef;
 
diff -Naur cmds.orig/stopDaemon cmds/stopDaemon
--- cmds.orig/stopDaemon	2007-11-07 20:53:35.000000000 +0100
+++ cmds/stopDaemon	2013-12-17 21:46:25.360968150 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdStopDaemon {
+    our ($crypto_layer);
 
     print startLogPage( gettext("Stop the daemons for the crypto tokens") );
 
diff -Naur cmds.orig/test_cert cmds/test_cert
--- cmds.orig/test_cert	2007-11-07 20:53:37.000000000 +0100
+++ cmds/test_cert	2013-12-17 21:47:18.947931043 +0100
@@ -12,6 +12,8 @@
 
 sub cmdTest_cert {
 
+    our ($query);
+
     # Text to sign
 # To be fixed later:
 # Calling gettext here crashes "Test certificate" stage when using MS IE
diff -Naur cmds.orig/verifyEmail cmds/verifyEmail
--- cmds.orig/verifyEmail	2011-02-14 06:36:11.000000000 +0100
+++ cmds/verifyEmail	2013-12-17 22:00:01.804150663 +0100
@@ -60,7 +60,7 @@
 
 sub cmdVerifyEmail {
 
-	our ($errval, $query, $cryptoShell);
+	our ($errval, $query, $cryptoShell, $db);
 
 	my ($info_list, $cmd_panel, $req);
 
diff -Naur cmds.orig/viewCRL cmds/viewCRL
--- cmds.orig/viewCRL	2010-03-04 23:39:25.000000000 +0100
+++ cmds/viewCRL	2013-12-17 22:06:55.633229306 +0100
@@ -11,6 +11,7 @@
 use strict;
 
 sub cmdViewCRL {
+    our ($query, $db);
 
     ## Get passed parameters
     my $dataType = $query->param('dataType');
diff -Naur cmds.orig/viewCRR cmds/viewCRR
--- cmds.orig/viewCRR	2010-02-19 00:53:13.000000000 +0100
+++ cmds/viewCRR	2013-12-17 22:24:27.498430947 +0100
@@ -27,6 +27,7 @@
 use strict;
 
 sub cmdViewCRR {
+    our ($query, $db, $tools, $self);
 
     ## Get the Configuration parameters ...
     my $def;
@@ -151,8 +152,8 @@
 
 	$lnk = new CGI({cmd=>"viewSignature", dataType=>$dataType, key=>$key});
 	$retCode = libCheckSignature( OBJECT=>$req );
-	if( ($retCode eq CRYPTO_SIGNATURE_OK) or 
-				( $retCode eq CRYPTO_SIGNER_SUSPENDED ) ) {
+	if( ($retCode eq "CRYPTO_SIGNATURE_OK") or 
+				( $retCode eq "CRYPTO_SIGNER_SUSPENDED" ) ) {
 		$tmp = $query->img({src=>getRequired ('ValidSigImage'),
 			border=>"0", align=>"MIDDLE", style=>"$sigInfoStyle"});
 	} else {
diff -Naur cmds.orig/viewCSR cmds/viewCSR
--- cmds.orig/viewCSR	2013-08-03 16:56:00.000000000 +0200
+++ cmds/viewCSR	2013-12-17 22:26:00.665684495 +0100
@@ -248,7 +248,7 @@
 		my $tmp;
 		$isSigned = 1;
 		$lnk = new CGI({cmd=>"viewSignature", dataType=>$dataType, key=>$key});
-		if( libCheckSignature( OBJECT=>$req ) == CRYPTO_SIGNATURE_OK ) {
+		if( libCheckSignature( OBJECT=>$req ) == "CRYPTO_SIGNATURE_OK" ) {
 			$tmp = $query->img({src=>getRequired ('ValidSigImage'),
 					border=>"0", align=>"MIDDLE",
 					style=>"$sigInfoStyle"});
@@ -392,6 +392,8 @@
 	my $style = "color: black;";
 	if ( $parsed_req->{HEADER}->{NOTBEFORE} and 
 			( $req->getStatus() !~ /ARCHIVED|DELETED/ ) ) {
+		our ($cryptoShell);
+
 		my $tmpDate = $cryptoShell->getNumericDateDays ( 
 				$parsed_req->{HEADER}->{NOTBEFORE} );
 		my $now = $cryptoShell->getNumericDateDays ();
@@ -461,7 +463,7 @@
 		# $info_list->{BODY}->[$info_pos++]->[0] = "<br/>";
 
 		if ( libCheckSignature ( OBJECT => $req ) 
-						!= CRYPTO_SIGNATURE_OK) {
+						!= "CRYPTO_SIGNATURE_OK") {
 			$style = "color: red;";
 			$status = "Error ($errno)";
 		} else {
diff -Naur cmds.orig/viewLog cmds/viewLog
--- cmds.orig/viewLog	2007-11-07 20:53:36.000000000 +0100
+++ cmds/viewLog	2013-12-17 22:11:32.083251949 +0100
@@ -10,6 +10,7 @@
 use strict;
 
 sub cmdViewLog {
+    our ($query, $log);
 
     my $key     = $query->param('key');
 
diff -Naur cmds.orig/viewSignature cmds/viewSignature
--- cmds.orig/viewSignature	2010-02-06 08:27:46.000000000 +0100
+++ cmds/viewSignature	2013-12-17 22:35:26.504573802 +0100
@@ -14,6 +14,8 @@
 
 sub cmdViewSignature {
 
+our ($query, $db, $errval);
+
 ## Get the Configuration parameters ...
 my ( $parsed, $lnk, $serLink, $sigInfo, $sigStatus, $signer, $signature);
 my ( $baseDoc, $info, $sigCertStatus, $def, $dbStatus, $dbMessage);
@@ -63,22 +65,22 @@
 ## Check Signature Status
 $sigCode = libCheckSignature( SIGNATURE=>$signature );
 
-if( ( $sigCode ne CRYPTO_SIGNATURE_OK ) and 
-	( $sigCode ne CRYPTO_SIGNER_SUSPENDED ) and 
-		( $sigCode ne CRYPTO_SIGNER_EXPIRED ) ) {
+if( ( $sigCode ne "CRYPTO_SIGNATURE_OK" ) and 
+	( $sigCode ne "CRYPTO_SIGNER_SUSPENDED" ) and 
+		( $sigCode ne "CRYPTO_SIGNER_EXPIRED" ) ) {
 	# $sigStatus = "<FONT COLOR=\"Red\">".gettext("Error")."</FONT>";
 	# $sigMessage = gettext ("Signature Verification Error!");
 
 	$sigInfo = $query->img({-src=>getRequired ('SigErrorImage'),
 				-align=>"MIDDLE", -style=>"$sigInfoStyle"});
 
-	if ($sigCode eq CRYPTO_SIGNATURE_ERROR ) {
+	if ($sigCode eq "CRYPTO_SIGNATURE_ERROR" ) {
 		$sigStatus = gettext ("Error");
 		$sigMessage = gettext ("Signature general error");
-	} elsif ( $sigCode eq CRYPTO_SIGNER_NOT_IN_DB ) {
+	} elsif ( $sigCode eq "CRYPTO_SIGNER_NOT_IN_DB" ) {
 		$sigStatus = gettext ("Verified w/ Signer's Error");
 		$sigMessage = gettext ("Signer's certificate unknown");
-	} elsif ( $sigCode eq CRYPTO_SIGNER_REVOKED ) {
+	} elsif ( $sigCode eq "CRYPTO_SIGNER_REVOKED" ) {
 		$sigStatus = gettext ("Verified w/ Signer's Error");
 		$sigMessage = gettext ("Signer's certificate is revoked");
 	} else {
@@ -96,9 +98,9 @@
 			border=>"0", align=>"MIDDLE", 
 			style=>"$sigInfoStyle"});
 
-	if ( $sigCode eq CRYPTO_SIGNER_EXPIRED ) {
+	if ( $sigCode eq "CRYPTO_SIGNER_EXPIRED" ) {
 		$sigStatus .= " [but signer's cert is expired]";
-	} elsif ( $sigCode eq CRYPTO_SIGNER_SUSPENDED ) {
+	} elsif ( $sigCode eq "CRYPTO_SIGNER_SUSPENDED" ) {
 		$sigStatus .= " [but signer's cert is suspended]";
 	}
 }
diff -Naur cmds.orig/warnExpiring cmds/warnExpiring
--- cmds.orig/warnExpiring	2007-11-07 20:53:37.000000000 +0100
+++ cmds/warnExpiring	2013-12-17 22:39:38.248953384 +0100
@@ -14,6 +14,7 @@
 our ($LANGUAGE);
 
 sub cmdWarnExpiring {
+    our ($query, $tools, $db, $DEBUG, $cryptoShell);
 
     my $service_email = getRequired ('SERVICE_MAIL_ACCOUNT');
     my $filename      = $query->subVar (getRequired ('WARN_EXPIRING_MSG'), "__LANGUAGE__", $LANGUAGE);