You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by wr...@apache.org on 2009/05/31 10:55:33 UTC

svn commit: r780386 - /httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c

Author: wrowe
Date: Sun May 31 08:55:32 2009
New Revision: 780386

URL: http://svn.apache.org/viewvc?rev=780386&view=rev
Log:
fix CMSG_LEN test for linux

Modified:
    httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c

Modified: httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c?rev=780386&r1=780385&r2=780386&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c (original)
+++ httpd/mod_ftp/trunk/modules/ftp/ftp_lowportd.c Sun May 31 08:55:32 2009
@@ -249,8 +249,8 @@
 
 #ifdef HAVE_STRUCT_MSGHDR_MSG_CONTROL
     cmsg = CMSG_FIRSTHDR(&msg);
-    if (cmsg && CMSG_LEN == sizeof(int) && cmsg->cmsg_level == SOL_SOCKET
-                                        && cmsg->cmsg_type == SCM_RIGHTS)
+    if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(int))
+             && cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS)
         sockinfo.os_sock = (int *)CMSG_DATA(cmsg);
     else
 #else