Changeset 904
- Timestamp:
- 04/04/05 22:27:15 (7 years ago)
- Files:
-
- trunk/node/munin-node.in (modified) (10 diffs)
- trunk/server/munin-update.in (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/node/munin-node.in
r902 r904 279 279 net_write (join " ", grep { &has_access ($_); } keys %{$nodes{$node}}); 280 280 #print join " ", keys %{$nodes{$node}}; 281 net_write (" .\n");281 net_write ("\n"); 282 282 } 283 283 … … 407 407 ($sconf{$service}{'group'}?" $sconf{$service}{group}":""); 408 408 409 net_write ("# Want to run as euid/egid $u/$g\n") if $DEBUG;409 # net_write ("# Want to run as euid/egid $u/$g\n") if $DEBUG; 410 410 411 411 $( = $g unless $g == 0; … … 416 416 if ($> != $u or $g != (split (' ', $)))[0]) 417 417 { 418 net_write ("# Can't drop privileges. Bailing out. (wanted uid=",419 ($sconf{$service}{'user'} || $defuser), " gid=\"",420 $gs, "\"($g), got uid=$> gid=\"$)\"(",421 (split (' ', $)))[0], ").\n");418 # net_write ("# Can't drop privileges. Bailing out. (wanted uid=", 419 # ($sconf{$service}{'user'} || $defuser), " gid=\"", 420 # $gs, "\"($g), got uid=$> gid=\"$)\"(", 421 # (split (' ', $)))[0], ").\n"); 422 422 logger ("Plugin \"$service\" Can't drop privileges. ". 423 423 "Bailing out. (wanted uid=". … … 428 428 } 429 429 } 430 net_write ("# Running as uid/gid/euid/egid $</$(/$>/$)\n") if $DEBUG;430 # net_write ("# Running as uid/gid/euid/egid $</$(/$>/$)\n") if $DEBUG; 431 431 if (!&check_perms ("$servicedir/$service")) 432 432 { 433 net_write ("# Error: unsafe permissions. Bailing out.");433 # net_write ("# Error: unsafe permissions. Bailing out."); 434 434 logger ("Error: unsafe permissions. Bailing out."); 435 435 exit 2; … … 442 442 foreach my $key (keys %{$sconf{$service}{'env'}}) 443 443 { 444 net_write ("# Setting environment $key=$sconf{$service}{env}{$key}\n") if $DEBUG;444 # net_write ("# Setting environment $key=$sconf{$service}{env}{$key}\n") if $DEBUG; 445 445 $ENV{"$key"} = $sconf{$service}{'env'}{$key}; 446 446 } … … 462 462 } 463 463 print STDERR "# About to run \"", join (' ', @run), "\"\n" if $DEBUG; 464 net_write ("# About to run \"", join (' ', @run), "\"\n") if $DEBUG;464 # net_write ("# About to run \"", join (' ', @run), "\"\n") if $DEBUG; 465 465 exec (@run) if @run; 466 466 } 467 467 else 468 468 { 469 net_write ("# Execing...\n") if $DEBUG;469 # net_write ("# Execing...\n") if $DEBUG; 470 470 exec ("$servicedir/$service", $command); 471 471 } 472 472 } 473 473 else { 474 net_write ("# Unable to fork.\n");474 # net_write ("# Unable to fork.\n"); 475 475 logger ("Unable to fork."); 476 476 } … … 548 548 if (defined $err and length $err) 549 549 { 550 logger ("TLS Warning : $err");550 logger ("TLS Warning in net_read: $err"); 551 551 } 552 552 } … … 569 569 if (defined $err and length $err) 570 570 { 571 logger ("TLS Warning : $err");571 logger ("TLS Warning in net_write: $err"); 572 572 } 573 573 } … … 746 746 logger ("TLS Notice: client cert: " . Net::SSLeay::dump_peer_certificate($tls)); 747 747 } 748 &net_read (); # Slurp an empty line.749 748 750 749 return $res; … … 982 981 (my $tmpservice = $wildservice) =~ s/\*$//; 983 982 next unless ($name =~ /^$tmpservice/); 984 net_write ("Checking $wildservice...\n") if $DEBUG;983 # net_write ("# Checking $wildservice...\n") if $DEBUG; 985 984 986 985 if ($var eq 'env') trunk/server/munin-update.in
r901 r904 575 575 } 576 576 &fetch_node($domain,$name,$node,$socket); 577 Net::SSLeay::free ($tls) if ($tls); # Shut down TLS577 # Net::SSLeay::free ($tls) if ($tls); # Shut down TLS 578 578 close $socket; 579 579 alarm (0); # Don't want to interrupt this. … … 599 599 next unless (&config_node($domain,$name,$node,$oldnode,$socket)); 600 600 &fetch_node($domain,$name,$node,$socket); 601 Net::SSLeay::free ($tls) if ($tls); # Shut down TLS601 # Net::SSLeay::free ($tls) if ($tls); # Shut down TLS 602 602 close $socket; 603 603 } … … 751 751 logger ("TLS Error: Could not enable TLS: " . &Net::SSLeay::print_errs()); 752 752 } 753 753 read_socket_single(); # Get rid of empty line 754 754 return $res; 755 755 } … … 763 763 local $SIG{ALRM} = sub { die "Could not run list on socket: $!\n"}; 764 764 alarm 5; 765 if ( $tls)765 if (defined $tls and $tls) 766 766 { 767 unless (Net::SSLeay::write($tls, $text)) 767 Net::SSLeay::write($tls, $text); 768 my $err = &Net::SSLeay::print_errs(); 769 if (defined $err and length $err) 768 770 { 769 logger (" Fatal: error during socket write: $!");771 logger ("TLS Warning in write_socket_single: $err"); 770 772 exit 9; 771 773 } … … 793 795 { 794 796 $res = Net::SSLeay::read($tls); 797 my $err = &Net::SSLeay::print_errs(); 798 if (defined $err and length $err) 799 { 800 logger ("TLS Warning in read_socket_single: $err"); 801 } 795 802 } 796 803 else … … 823 830 { 824 831 while (defined ($_ = Net::SSLeay::read($tls))) { 832 my $err = &Net::SSLeay::print_errs(); 833 if (defined $err and length $err) 834 { 835 logger ("TLS Warning in read_socket: $err"); 836 } 825 837 chomp; 826 Net::SSLeay::print_errs('SSL_read');827 838 last if (/^\.$/); 828 839 push @array,$_;
