Changeset 335

Show
Ignore:
Timestamp:
05/06/07 23:22:13 (2 years ago)
Author:
kindlund
Message:

merged trunk changes into exp branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/exp/kindlund-filesystem/lib/HoneyClient/Agent.pm

    r320 r335  
    243243# initialized integrity state of the VM -- ready to be checked 
    244244# against, at any time. 
    245 our $integrity = undef; 
     245#our $integrity = undef; 
    246246our $integrityState : shared = undef; 
    247247 
    …… 
    371371    # Perform initial integrity baseline check. 
    372372    #my $integrity = undef; 
    373     if ($PERFORM_INTEGRITY_CHECKS) { 
    374         $integrity = HoneyClient::Agent::Integrity->new(); 
    375         $integrity->closeFiles(); 
    376         $integrityState = freeze($integrity); 
    377     } 
     373    #if ($PERFORM_INTEGRITY_CHECKS) { 
     374    #    $integrity = HoneyClient::Agent::Integrity->new(); 
     375    #    $integrity->closeFiles(); 
     376    #    $integrityState = freeze($integrity); 
     377    #} 
    378378    # XXX: Check to make sure this doesn't destroy the integrity 
    379379    # object prematurely. 
    …… 
    733733                    # As such, do NOT try to call integrity checks on multiple, simultaneous 
    734734                    # asynchronous threaded drivers. 
    735                     $integrity = thaw($integrityState); 
     735                    #$integrity = thaw($integrityState); 
    736736                    # Perform initial integrity baseline check. 
    737737                    #print "Initializing Integrity Check...\n"; 
    738738                    # TODO: Initialize Integrity Checks 
    739                     #$integrity = HoneyClient::Agent::Integrity->new(); 
     739                    $integrity = HoneyClient::Agent::Integrity->new(); 
    740740                } 
    741741 

  • honeyclient/branches/exp/kindlund-filesystem/t/honeyclient_agent.t

    r131 r335  
    4343 
    4444# Make sure Storable loads. 
    45 BEGIN { use_ok('Storable', qw(nfreeze thaw)) or diag("Can't load Storable package.  Check to make sure the package library is correctly listed within the path."); } 
     45BEGIN { use_ok('Storable', qw(freeze nfreeze thaw)) or diag("Can't load Storable package.  Check to make sure the package library is correctly listed within the path."); } 
    4646require_ok('Storable'); 
     47can_ok('Storable', 'freeze'); 
    4748can_ok('Storable', 'nfreeze'); 
    4849can_ok('Storable', 'thaw'); 
    49 use Storable qw(nfreeze thaw); 
     50use Storable qw(freeze nfreeze thaw); 
    5051 
    5152# Make sure MIME::Base64 loads.