Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: linux-ha by horms from
([email protected])
2. Linux-HA CVS: ldirectord by horms from
([email protected])
3. Linux-HA CVS: debian by horms from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Tue, 4 Jul 2006 21:49:45 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -3 -r1.182 -r1.183
--- heartbeat.spec.in 5 Jul 2006 03:40:44 -0000 1.182
+++ heartbeat.spec.in 5 Jul 2006 03:49:45 -0000 1.183
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.182 2006/07/05 03:40:44 horms Exp $
+# $Id: heartbeat.spec.in,v 1.183 2006/07/05 03:49:45 horms Exp $
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
@@ -23,7 +23,7 @@
%package ldirectord
Summary: Monitor daemon for maintaining high availability resources
Group: Utilities
-Requires: perl, perl-libwww-perl perl-Crypt-SSLeay, ipvsadm, perl-HTML-Parser,
perl-ldap, perl-MailTools, perl-Mail-IMAPClient, perl-Net-IMAP-Simple-SSL,
perl-POP3Client, perl-libnet, perl-Net-DNS
+Requires: perl, perl-libwww-perl perl-Crypt-SSLeay, ipvsadm, perl-HTML-Parser,
perl-ldap, perl-MailTools, perl-Net-IMAP-Simple, perl-Net-IMAP-Simple-SSL,
perl-POP3Client, perl-libnet, perl-Net-DNS
# perl-libwww-perl, perl-HTML-Parser, perl-ldap, perl-MailTools,
# perl-Mail-IMAPClient, perl-Net-IMAP-Simple-SSL, perl-POP3Client,
# perl-libnet, perl-Net-DNS and ipvsadm
------------------------------
Message: 2
Date: Tue, 4 Jul 2006 21:49:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
ldirectord
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -3 -r1.137 -r1.138
--- ldirectord 5 Jul 2006 03:40:44 -0000 1.137
+++ ldirectord 5 Jul 2006 03:49:45 -0000 1.138
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.137 2006/07/05 03:40:44 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.138 2006/07/05 03:49:45 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -1855,35 +1855,39 @@
}
}
-
sub check_pop
{
- require Net::POP3;
- my ($v, $r) = @_;
- my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
-
- &ld_debug(2, "Checking pop server=$$r{server} port=$port");
-
- my $pop = new Net::POP3($$r{server}, Port => $port,
- Timeout => $$v{negotiatetimeout});
- if (!$pop) {
- service_set($v, $r, "down");
- return 1;
- }
+ require Mail::POP3Client;
+ my ($v, $r) = @_;
+ my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
- if($$v{login} ne "") {
- $pop->user($$v{login});
- my $num = $pop->pass($$v{passwd});
- if (!defined($num)) {
- $pop->quit();
- service_set($v, $r, "down");
- return 0;
- }
- }
-
- $pop->quit();
- service_set($v, $r, "up");
- return 1;
+ &ld_debug(2, "Checking pop server=$$r{server} port=$port");
+
+ my $pop = new Mail::POP3Client(USER => $$v{login},
+ PASSWORD => $$v{passwd},
+ HOST => $$r{server},
+ USESSL => 0,
+ PORT => $port,
+ DEBUG => 0,
+ TIMEOUT => $$v{negotiatetimeout});
+
+ if (!$pop) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+
+ if($$v{login} ne "") {
+ my $authres = $pop->login();
+ $pop->close();
+ if (!$authres) {
+ service_set($v, $r, "down");
+ return 0;
+ }
+ }
+
+ $pop->close();
+ service_set($v, $r, "up");
+ return 1;
}
sub check_pops
@@ -1923,33 +1927,33 @@
sub check_imap
{
- require Mail::IMAPClient;
- my ($v, $r) = @_;
- my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
-
- &ld_debug(2, "Checking imap server=$$r{server} port=$port");
-
- my $imap = new Mail::IMAPClient(Server => $$r{server}, Port=>$port,
- Timeout => $$v{negotiatetimeout},
- User => $$v{login},
- Password => $$v{passwd});
- if (!$imap) {
- service_set($v, $r, "down");
- return 1;
- }
-
- if($$v{login} ne "") {
- my $authres = $imap->login();
- $imap->logout();
- if (!$authres) {
- service_set($v, $r, "down");
- return 1;
- }
- }
-
- $imap->logout();
- service_set($v, $r, "up");
- return 0;
+ require Net::IMAP::Simple;
+ my ($v, $r) = @_;
+ my $port=(defined $$v{checkport}?$$v{checkport}:$$r{port});
+
+ &ld_debug(2, "Checking imap server=$$r{server} port=$port");
+
+ my $imap = Net::IMAP::Simple->new($$r{server},
+ port => $port,
+ timeout => $$v{negotiatetimeout});
+
+ if (!$imap) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+
+ if($$v{login} ne "") {
+ my $authres = $imap->login($$v{login},$$v{passwd});
+ $imap->quit;
+ if (!$authres) {
+ service_set($v, $r, "down");
+ return 1;
+ }
+ }
+
+ $imap->quit();
+ service_set($v, $r, "up");
+ return 0;
}
sub check_imaps
------------------------------
Message: 3
Date: Tue, 4 Jul 2006 21:49:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: debian by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : debian
Dir : linux-ha/debian
Modified Files:
control
Log Message:
ldirectord: Consolidate modules used by the imap, imaps, pop and pops checks
The imap and imaps, and pop and pops checks now use common library code,
and should look much the same. They could probably be merged, but
this is clean enough for now.
Removes the following dependancy for the ldirectord package
Debian: libmail-imapclient-perl
RPM: perl-Mail-IMAPClient
Adds the following new dependancy for the ldirectord package
Debian: libnet-imap-simple-perl (already required by
libnet-imap-simple-ssl-perl)
RPM: perl-Net-IMAP-Simple-SSL (already required by
perl-Net-IMAP-Simple-SSL)
Thanks to Julien Ducros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/debian/control,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- control 5 Jul 2006 03:40:44 -0000 1.47
+++ control 5 Jul 2006 03:49:45 -0000 1.48
@@ -9,7 +9,7 @@
Section: admin
Priority: optional
Architecture: all
-Depends: ${perl:Depends}, ipvsadm, libcrypt-ssleay-perl, libdbi-perl,
libdigest-hmac-perl, libdigest-md5-perl, libmail-imapclient-perl,
libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl,
libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
+Depends: ${perl:Depends}, ipvsadm, libcrypt-ssleay-perl, libdbi-perl,
libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl,
libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl,
libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl
Recommends: sysklogd|syslog-ng, logrotate
Provides: ldirectord
Conflicts: ldirectord
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 32, Issue 14
********************************************
