From 69ea6464ba71bf1360bfd6687c0ccef148346287 Mon Sep 17 00:00:00 2001 From: Florian Date: Thu, 27 Mar 2014 17:36:41 +0100 Subject: [PATCH] Revert 8342fc6820de240e5983a85ee4ea761a7b18d4c4 --- apps/apache/serverstatus/mode/libconnect.pm | 2 +- apps/apache/serverstatus/mode/requests.pm | 5 +---- apps/apache/serverstatus/mode/responsetime.pm | 5 ----- apps/apache/serverstatus/mode/slotstates.pm | 5 ----- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/apps/apache/serverstatus/mode/libconnect.pm b/apps/apache/serverstatus/mode/libconnect.pm index 7294649a2..5bdaa1277 100644 --- a/apps/apache/serverstatus/mode/libconnect.pm +++ b/apps/apache/serverstatus/mode/libconnect.pm @@ -49,7 +49,7 @@ sub connect { my $content; if (defined $self->{option_results}->{credentials}) { - $ua->credentials($self->{option_results}->{hostname}.':'.$self->{option_results}->{port},$self->{option_results}->{realm},$self->{option_results}->{username},$self->{option_results}->{password}); + $ua->credentials($self->{option_results}->{hostname}.':'.$self->{option_results}->{port},$self->{option_results}->{username},$self->{option_results}->{password}); } if ($self->{option_results}->{proto} eq "https") { diff --git a/apps/apache/serverstatus/mode/requests.pm b/apps/apache/serverstatus/mode/requests.pm index 8e8ae45fa..21256d7f3 100644 --- a/apps/apache/serverstatus/mode/requests.pm +++ b/apps/apache/serverstatus/mode/requests.pm @@ -56,7 +56,6 @@ sub new { "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, - "realm:s" => { name => 'realm', default => 'Authentification' }, "proxyurl:s" => { name => 'proxyurl' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -210,9 +209,7 @@ Specify username for basic authentification (Mandatory if --credentials is speci Specify password for basic authentification (Mandatory if --credentials is specidied) -=item B<--realm> - -Credentials Realm (Default: 'Authentification') +=item B<--password> =item B<--timeout> diff --git a/apps/apache/serverstatus/mode/responsetime.pm b/apps/apache/serverstatus/mode/responsetime.pm index bc15957fe..7f7a5827f 100644 --- a/apps/apache/serverstatus/mode/responsetime.pm +++ b/apps/apache/serverstatus/mode/responsetime.pm @@ -57,7 +57,6 @@ sub new { "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, - "realm:s" => { name => 'realm', default => 'Authentification' }, "proxyurl:s" => { name => 'proxyurl' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -176,10 +175,6 @@ Specify username for basic authentification (Mandatory if --credentials is speci Specify password for basic authentification (Mandatory if --credentials is specidied) -=item B<--realm> - -Credentials Realm (Default: 'Authentification') - =item B<--proxyurl> Proxy URL if any diff --git a/apps/apache/serverstatus/mode/slotstates.pm b/apps/apache/serverstatus/mode/slotstates.pm index 2cf877084..1bb81396b 100644 --- a/apps/apache/serverstatus/mode/slotstates.pm +++ b/apps/apache/serverstatus/mode/slotstates.pm @@ -56,7 +56,6 @@ sub new { "credentials" => { name => 'credentials' }, "username:s" => { name => 'username' }, "password:s" => { name => 'password' }, - "realm:s" => { name => 'realm', default => 'Authentification' }, "proxyurl:s" => { name => 'proxyurl' }, "warning:s" => { name => 'warning' }, "critical:s" => { name => 'critical' }, @@ -203,10 +202,6 @@ Specify username for basic authentification (Mandatory if --credentials is speci Specify password for basic authentification (Mandatory if --credentials is specidied) -=item B<--realm> - -Credentials Realm (Default: 'Authentification') - =item B<--timeout> Threshold for HTTP timeout