From: TJ S. <cas...@us...> - 2012-07-27 16:27:59
|
Update of /cvsroot/proftp/proftpd/src In directory vz-cvs-3.sog:/tmp/cvs-serv5967/src Modified Files: Tag: B1_3_4 inet.c Log Message: Backporting fix for Bug#3804 to 1.3.4 branch. Index: inet.c =================================================================== RCS file: /cvsroot/proftp/proftpd/src/inet.c,v retrieving revision 1.135.2.2 retrieving revision 1.135.2.3 diff -u -d -r1.135.2.2 -r1.135.2.3 --- inet.c 15 May 2012 21:44:22 -0000 1.135.2.2 +++ inet.c 27 Jul 2012 16:27:57 -0000 1.135.2.3 @@ -1280,9 +1280,10 @@ res->mode = CM_OPEN; #if defined(HAVE_STROPTS_H) && defined(I_SRDOPT) && defined(RPROTDIS) && \ - defined(SOLARIS2) + (defined(SOLARIS2_9) || defined(SOLARIS2_10)) /* This is needed to work around control messages in STREAMS devices - * (as on Solaris 9/NFS). + * (as on Solaris 9/NFS). The underlying issue is reported to be fixed + * in Solaris 11. */ while (ioctl(res->rfd, I_SRDOPT, RPROTDIS) < 0) { if (errno == EINTR) { |