Show
Ignore:
Timestamp:
12/20/06 11:09:07 (2 years ago)
Author:
kindlund
Message:

sc: merging branch using tags svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/bug/PRE-42 and svn+ssh://kindlund@www.honeyclient.org/home/svn/honeyclient/honeyclient/tags/bug/POST-42

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • honeyclient/branches/rel/0.9

    • Property sc:bug-fix-release-branch set to 0.9

  • honeyclient/branches/rel/0.9/bin/StartAgent.pl

    • Property svn:keywords set to Id "$file"
    r13 r130  
    1 #!perl -w 
     1#!perl -w -Ilib 
     2 
     3# $Id$ 
    24 
    35use strict; 
    …… 
    3537    print "Watchdog fault detected, recovering Agent daemon.\n"; 
    3638    # XXX: Reenable this, eventually. 
    37 #    Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
     39    #Carp::carp __PACKAGE__ . "->_watchdogFaultHandler(): Error occurred during processing.\n" . $errMsg; 
    3840 
    3941 

  • honeyclient/branches/rel/0.9/bin/StartManager.pl

    • Property svn:keywords set to Id "$file"
    r13 r130  
    1 #!/usr/bin/perl -w 
     1#!perl -w -Ilib 
     2 
     3# $Id$ 
    24 
    35use strict; 
    …… 
    2022my $agentState = HoneyClient::Manager->run( 
    2123                    driver           => 'IE', # Change to 'IE' or 'FF' 
    22                     master_vm_config => '/vm/Agent.Master-2/winXPPro.cfg', 
     24                    master_vm_config => '/vm/Agent.Master-7/winXPPro.cfg', 
    2325                    agent_state      => encode_base64(nfreeze({ 
    2426                        IE => { # Change to 'IE' or 'FF' 
    …… 
    2628                            # Enable this line, if you want to only go to the 
    2729                            # first 5 links for each domain. 
    28                             #max_relative_links_to_visit => 5, 
     30                            max_relative_links_to_visit => 5, 
    2931                         }, 
    3032                    })),