monit CHANGES.txt configure.ac protocols/ssh.c

[Martin Pala]

CVSROOT:        /sources/monit
Module name:    monit
Changes by:     Martin Pala <martinp>   06/06/06 11:05:58

Modified files:
        .              : CHANGES.txt configure.ac 
        protocols      : ssh.c 

Log message:
        fix the sun-ssh fatal warning related to socket closure

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/monit/CHANGES.txt?cvsroot=monit&r1=1.301&r2=1.302
http://cvs.savannah.gnu.org/viewcvs/monit/configure.ac?cvsroot=monit&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/monit/protocols/ssh.c?cvsroot=monit&r1=1.13&r2=1.14

Patches:
Index: CHANGES.txt
===================================================================
RCS file: /sources/monit/monit/CHANGES.txt,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -b -r1.301 -r1.302
--- CHANGES.txt 10 May 2006 17:13:43 -0000      1.301
+++ CHANGES.txt 6 Jun 2006 11:05:58 -0000       1.302
@@ -1,7 +1,14 @@
-                        CHANGES version 4.8.1
+                        CHANGES version 4.8.2
 
             This file summarizes changes made since 3.0
 
+Version 4.8.2
+
+BUGFIXES:
+* Fix the sun-sshd socket close warning for ssh protocol
+  test.
+
+
 Version 4.8.1
 
 BUGFIXES:

Index: configure.ac
===================================================================
RCS file: /sources/monit/monit/configure.ac,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- configure.ac        4 May 2006 23:50:03 -0000       1.137
+++ configure.ac        6 Jun 2006 11:05:58 -0000       1.138
@@ -1,16 +1,16 @@
 # Process this file with autoconf to produce a configure script.
 # Mark Ferlatte, <address@hidden>
 #
-# $Id: configure.ac,v 1.137 2006/05/04 23:50:03 martinp Exp $
+# $Id: configure.ac,v 1.138 2006/06/06 11:05:58 martinp Exp $
 
 # autoconf requirement
 AC_PREREQ([2.53])
 
 # Init autoconf and automake
-AC_INIT([monit], [4.8.1], address@hidden)
+AC_INIT([monit], [4.8.2-cvs], address@hidden)
 
 # Package info
-AC_REVISION([$Revision: 1.137 $])
+AC_REVISION([$Revision: 1.138 $])
 AC_CONFIG_SRCDIR([monitor.c])
 
 # ------------------------------------------------------------------------

Index: protocols/ssh.c
===================================================================
RCS file: /sources/monit/monit/protocols/ssh.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- protocols/ssh.c     27 Apr 2006 20:16:03 -0000      1.13
+++ protocols/ssh.c     6 Jun 2006 11:05:58 -0000       1.14
@@ -37,7 +37,7 @@
  * 
  *  @author Igor Homyakov, <address@hidden>
  *
- *  @version \$Id: ssh.c,v 1.13 2006/04/27 20:16:03 martinp Exp $
+ *  @version \$Id: ssh.c,v 1.14 2006/06/06 11:05:58 martinp Exp $
  *
  *  @file
  */
@@ -63,6 +63,9 @@
     return FALSE;
   }
    
+  /* Read one extra line to prevent the "Read from socket failed" warning */
+  socket_readln(s, buf, sizeof(buf));
+   
   return TRUE;
   
 }