From MAILER-DAEMON Wed Jul 13 22:11:50 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QhBP3-0003bE-I0
	for mharc-commit-inetutils@gnu.org; Wed, 13 Jul 2011 22:11:49 -0400
Received: from eggs.gnu.org ([140.186.70.92]:33428)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QhBOz-0003ag-Gs
	for commit-inetutils@gnu.org; Wed, 13 Jul 2011 22:11:47 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QhB8E-0001id-UD
	for commit-inetutils@gnu.org; Wed, 13 Jul 2011 21:54:44 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:48888)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QhB8D-0001FO-6F
	for commit-inetutils@gnu.org; Wed, 13 Jul 2011 21:54:25 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <gnu@gisladisker.se>) id 1QgyqB-0004WD-DL
	for commit-inetutils@gnu.org; Wed, 13 Jul 2011 12:46:59 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1Qgyq1-0001ze-11
	for commit-inetutils@gnu.org; Wed, 13 Jul 2011 12:46:49 +0000
Date: Wed, 13 Jul 2011 12:46:49 +0000
Message-Id: <E1Qgyq1-0001ze-11@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-107-g7ccaddf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 77ca51191bd57e953a1c289290e9f5d94238ba55
X-Git-Newrev: 7ccaddf1f5f049343b7a85169550374d748916fc
From: Mats Erik Andersson <gnu@gisladisker.se>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jul 2011 02:11:47 -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  7ccaddf1f5f049343b7a85169550374d748916fc (commit)
      from  77ca51191bd57e953a1c289290e9f5d94238ba55 (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=7ccaddf1f5f049343b7a85169550374d748916fc


commit 7ccaddf1f5f049343b7a85169550374d748916fc
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Wed Jul 13 14:40:06 2011 +0200

    syslogd: Error recovery at config parsing.
    
    An empty action field makes OpenBSD go segfaulting.
    Signal such an entry as unused, instead of passing
    a NULL string as user name!

diff --git a/ChangeLog b/ChangeLog
index d0ae04c..69c305b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-13  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/syslogd.c (cfline): Prevent incrementing beyond string end.
+	Discard config line with empty action.
+	* tests/syslogd.sh: Three new degenerate config lines.
+
 2011-06-20  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* src/syslogd.c: Replace all `struct sockaddr_in' with
diff --git a/src/syslogd.c b/src/syslogd.c
index a56414e..4d73f69 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1860,7 +1860,7 @@ cfline (const char *line, struct filed *f)
       *bp = '\0';
 
       /* Skip cruft.  */
-      while (strchr (",;", *q))
+      while (*q && strchr (",;", *q))
 	q++;
 
       bp = buf;
@@ -1962,6 +1962,14 @@ cfline (const char *line, struct filed *f)
       p++;
     }
 
+  if (!strlen(p))
+    {
+      /* Invalidate an entry with empty action field.  */
+      f->f_type = F_UNUSED;
+      logerror ("empty action field");
+      return;
+    }
+
   switch (*p)
     {
     case '@':
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 124469d..05848b7 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -69,7 +69,12 @@ fi
 #
 cat > $CONF <<-EOT
 	*.*	$OUT
+	# Test incorrect forwarding.
 	*.*	@not.in.existence
+	# Recover from missing action field and short selector.
+	12345
+	*.*
+	*.	/dev/null
 EOT
 
 # Set REMOTE_LOGHOST to activate forwarding
@@ -77,6 +82,7 @@ EOT
 if [ -n "$REMOTE_LOGHOST" ]; then
 	# Append a forwarding stanza.
 	cat >> $CONF <<-EOT
+		# Forwarding remotely
 		*.*	@$REMOTE_LOGHOST
 	EOT
 fi

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    6 ++++++
 src/syslogd.c    |   10 +++++++++-
 tests/syslogd.sh |    6 ++++++
 3 files changed, 21 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Wed Jul 27 15:21:51 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1Qm9fz-0006wL-Mx
	for mharc-commit-inetutils@gnu.org; Wed, 27 Jul 2011 15:21:51 -0400
Received: from eggs.gnu.org ([140.186.70.92]:44746)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1Qm7qa-00007u-Cu
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 13:24:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1Qm7qZ-0002MD-5m
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 13:24:40 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:36998)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1Qm7qZ-0002Lb-3n
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 13:24:39 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1Qm7qY-0004DC-Fs
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 17:24:38 +0000
Date: Wed, 27 Jul 2011 17:24:38 +0000
Message-Id: <E1Qm7qY-0004DC-Fs@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-109-g8d1cf6d
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 13af03e20bc1420c374fa8f96cbed1d2299d8a1e
X-Git-Newrev: 8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e
From: Mats Erik Andersson <meand@vcs.savannah.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-Mailman-Approved-At: Wed, 27 Jul 2011 15:21:50 -0400
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2011 17:24:41 -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 <gnu@gisladisker.se>
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 <gnu@gisladisker.se>
+
+	* 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 <gnu@gisladisker.se>
 
 	* 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 


From MAILER-DAEMON Wed Jul 27 20:27:27 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QmERj-0000mR-GU
	for mharc-commit-inetutils@gnu.org; Wed, 27 Jul 2011 20:27:27 -0400
Received: from eggs.gnu.org ([140.186.70.92]:35220)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1QmERd-0000kh-Tq
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 20:27:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1QmERc-0008LT-Kp
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 20:27:21 -0400
Received: from vcs.savannah.gnu.org ([140.186.70.72]:40593)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1QmERc-0008LP-Gv
	for commit-inetutils@gnu.org; Wed, 27 Jul 2011 20:27:20 -0400
Received: from meand by vcs.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@vcs.savannah.gnu.org>) id 1QmERb-0005sW-BT
	for commit-inetutils@gnu.org; Thu, 28 Jul 2011 00:27:19 +0000
Date: Thu, 28 Jul 2011 00:27:19 +0000
Message-Id: <E1QmERb-0005sW-BT@vcs.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-110-g5757d35
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e
X-Git-Newrev: 5757d35130a858aad784222d9f70fa5ff6091575
From: Mats Erik Andersson <meand@vcs.savannah.gnu.org>
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.72
X-BeenThere: commit-inetutils@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: CVS commit notices for the GNU Internet utilities
	<commit-inetutils.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/commit-inetutils>
List-Post: <mailto:commit-inetutils@gnu.org>
List-Help: <mailto:commit-inetutils-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/commit-inetutils>,
	<mailto:commit-inetutils-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 28 Jul 2011 00:27:25 -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  5757d35130a858aad784222d9f70fa5ff6091575 (commit)
      from  8d1cf6d724bf9bdc7cacb3f93c8bdaf19dc3f08e (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=5757d35130a858aad784222d9f70fa5ff6091575


commit 5757d35130a858aad784222d9f70fa5ff6091575
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Thu Jul 28 02:11:12 2011 +0200

    ftpd: Misnamed variable in last commit.

diff --git a/ChangeLog b/ChangeLog
index 9a8a0a2..06dad03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-28  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ftpd/ftpd.c (getdatasock): Misnamed variable DATA_SOURCE.
+
 2011-07-25  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftpd/ftpd.c (getdatasock) [HAVE_STRUCT_SOCKADDR_IN_SIN_LEN]:
diff --git a/ftpd/ftpd.c b/ftpd/ftpd.c
index f259fa9..e4e7b2b 100644
--- a/ftpd/ftpd.c
+++ b/ftpd/ftpd.c
@@ -1031,7 +1031,7 @@ getdatasock (const char *mode)
   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);
+  data_source.sin_len = sizeof (struct sockaddr_in);
 #endif
   for (tries = 1;; tries++)
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |    4 ++++
 ftpd/ftpd.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


