[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-109-g8d1cf6d
From: |
Mats Erik Andersson |
Subject: |
[SCM] GNU Inetutils branch, master, updated. inetutils-1_8-109-g8d1cf6d |
Date: |
Wed, 27 Jul 2011 17:24:38 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".
The branch, master has been updated
via 8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e (commit)
from 13af03e20bc1420c374fa8f96cbed1d2299d8a1e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e
commit 8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e
Author: Mats Erik Andersson <address@hidden>
Date: Wed Jul 27 19:07:32 2011 +0200
ftpd: BSD systems need length value in 'sin_len'.
The structure `sockaddr_in' may carry an additional member
'sin_len', at least BSD systems. A correct value must be
assigned when manually initiating the structure.
diff --git a/ChangeLog b/ChangeLog
index 7c9b917..9a8a0a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-25 Mats Erik Andersson <address@hidden>
+
+ * ftpd/ftpd.c (getdatasock) [HAVE_STRUCT_SOCKADDR_IN_SIN_LEN]:
+ Assign value to structure member `sin_len'.
+ * ftpd/server_mode.c (server_mode) [HAVE...SIN_LEN]: Likewise.
+ * ftpd/ftpcmd.y (host_port) [HAVE...SIN_LEN]: Likewise.
+
2011-07-17 Mats Erik Andersson <address@hidden>
* src/syslogd.c (LogPort): Remove variable.
diff --git a/ftpd/ftpcmd.y b/ftpd/ftpcmd.y
index e60367d..ecb392c 100644
--- a/ftpd/ftpcmd.y
+++ b/ftpd/ftpcmd.y
@@ -615,6 +615,9 @@ host_port
p = (char *)&data_dest.sin_port;
p[0] = $9; p[1] = $11;
data_dest.sin_family = AF_INET;
+#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ data_dest.sin_len = sizeof (struct sockaddr_in);
+#endif
}
;
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index 1d87bd3..f259fa9 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1030,6 +1030,9 @@ getdatasock (const char *mode)
/* anchor socket to avoid multi-homing problems */
data_source.sin_family = AF_INET;
data_source.sin_addr = ctrl_addr.sin_addr;
+#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ data_dest.sin_len = sizeof (struct sockaddr_in);
+#endif
for (tries = 1;; tries++)
{
if (bind (s, (struct sockaddr *) &data_source,
diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c
index 9e166ab..e5b72e4 100644
--- a/ftpd/server_mode.c
+++ b/ftpd/server_mode.c
@@ -133,6 +133,9 @@ server_mode (const char *pidfile, struct sockaddr_in
*phis_addr, char *argv[])
memset (&server_addr, 0, sizeof server_addr);
server_addr.sin_family = AF_INET;
server_addr.sin_port = htons (port);
+#if HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
+ server_addr.sin_len = sizeof (struct sockaddr_in);
+#endif
if (bind (ctl_sock, (struct sockaddr *) &server_addr, sizeof server_addr))
{
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 7 +++++++
ftpd/ftpcmd.y | 3 +++
ftpd/ftpd.c | 3 +++
ftpd/server_mode.c | 3 +++
4 files changed, 16 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU Inetutils
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Inetutils branch, master, updated. inetutils-1_8-109-g8d1cf6d,
Mats Erik Andersson <=