Changeset 3611

Show
Ignore:
Timestamp:
05/23/10 00:54:31 (2 years ago)
Author:
bldewolf
Message:

Apply previous commits changes to trunk (fixes for TLS with unverifiable certificates).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/1.4-stable/common/lib/Munin/Common/TLS.pm

    r3484 r3611  
    214214    } 
    215215    Net::SSLeay::CTX_set_verify ($self->{tls_context},  
    216                                  &Net::SSLeay::VERIFY_PEER,  
     216                                 $self->{tls_verify}  ? &Net::SSLeay::VERIFY_PEER : 
     217                                                        &Net::SSLeay::VERIFY_NONE, 
    217218                                 $self->_tls_verify_callback($tls_verified)); 
    218219    $err = &Net::SSLeay::print_errs(""); 
  • branches/1.4-stable/node/lib/Munin/Node/Server.pm

    r3516 r3611  
    248248                  || "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem"; 
    249249    my $tls_verify = $config->{tls_verify_certificate} 
    250                   || 'no'
     250                  || 0
    251251    my $tls_match  = $config->{tls_match}; 
    252252