From MAILER-DAEMON Fri May 06 09:50:30 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QILQM-0003OR-3j
	for mharc-commit-inetutils@gnu.org; Fri, 06 May 2011 09:50:30 -0400
Received: from eggs.gnu.org ([140.186.70.92]:48058)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QILQK-0003Nt-16
	for commit-inetutils@gnu.org; Fri, 06 May 2011 09:50:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QILQI-0004RO-J7
	for commit-inetutils@gnu.org; Fri, 06 May 2011 09:50:27 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38725)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QILQI-0004RE-HE
	for commit-inetutils@gnu.org; Fri, 06 May 2011 09:50:26 -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 1QILQH-0002yq-SP
	for commit-inetutils@gnu.org; Fri, 06 May 2011 13:50:26 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1QILQH-0003pS-B3
	for commit-inetutils@gnu.org; Fri, 06 May 2011 13:50:25 +0000
Date: Fri, 06 May 2011 13:50:25 +0000
Message-Id: <E1QILQH-0003pS-B3@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-87-g6406851
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f4ff1bc8ebb92855507f854589fd50de0b1930a7
X-Git-Newrev: 6406851b3fb6cf4d396c49c7f2143369d7bd4a0e
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: Fri, 06 May 2011 13:50:29 -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  6406851b3fb6cf4d396c49c7f2143369d7bd4a0e (commit)
      from  f4ff1bc8ebb92855507f854589fd50de0b1930a7 (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=6406851b3fb6cf4d396c49c7f2143369d7bd4a0e


commit 6406851b3fb6cf4d396c49c7f2143369d7bd4a0e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Sun Apr 17 23:27:31 2011 +0200

    ftp: Activate support for IPv6.

diff --git a/ChangeLog b/ChangeLog
index 67e6427..31a9a84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-17  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* ftp/ftp_var.h (usefamily): New variable.
+	* ftp/main.c (argp_options): New options `ipv4` and `ipv6`.
+	(parse_opt): Parse cases '4' and '6', set USEFAMILY accordingly.
+	(main): Initialize USEFAMILY to `AF_UNSPEC`.
+	* ftp/ftp.c (hookup): Resolve addresses according to USEFAMILY.
+	Use macro AI_ADDRCONFIG only with family `AF_UNSPEC`.
+	(initconn): New IPv6 protocol methods `EPSV` and `LPSV`.
+	New variable DATA_ADDR_SA6.
+	(initconn) [noport]: New IPv6 methods `EPRT` and `LPRT`.
+
 2011-04-08  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftp/cmds.c (setepsv4): New function.
diff --git a/ftp/ftp.c b/ftp/ftp.c
index f144570..e8d21e1 100644
--- a/ftp/ftp.c
+++ b/ftp/ftp.c
@@ -132,9 +132,13 @@ hookup (char *host, int port)
   memset (&hisctladdr, 0, sizeof (hisctladdr));
   memset (&hints, 0, sizeof (hints));
 
-  hints.ai_family = AF_INET;
+  hints.ai_family = usefamily;
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_flags = AI_CANONNAME;
+#ifdef AI_ADDRCONFIG
+  if (hints.ai_family == AF_UNSPEC)
+    hints.ai_flags |= AI_ADDRCONFIG;
+#endif /* AI_ADDRCONFIG */
 
   status = getaddrinfo (host, portstr, &hints, &res);
   if (status)
@@ -1128,8 +1132,9 @@ initconn (void)
   socklen_t len;
   int on = 1;
   uint32_t a0, a1, a2, a3, p0, p1, port;
-  uint32_t af, hal, h[4], pal; /* RFC 1639: LPSV resonse.  */
+  uint32_t af, hal, h[16], pal; /* RFC 1639: LPSV resonse.  */
   struct sockaddr_in *data_addr_sa4 = (struct sockaddr_in *) &data_addr;
+  struct sockaddr_in6 *data_addr_sa6 = (struct sockaddr_in6 *) &data_addr;
 
   if (passivemode)
     {
@@ -1171,11 +1176,25 @@ initconn (void)
 	    printf ("Passive mode refused.\n");
 	    goto bad;
 	    break;
+	  case AF_INET6:
+	    if (command ("EPSV") == COMPLETE)
+	      {
+		good_epsv = 1;
+		break;
+	      }
+	    if (command ("LPSV") == COMPLETE)
+	      {
+		good_lpsv = 1;
+		break;
+	      }
+	    printf ("Passive mode refused.\n");
+	    goto bad;
+	    break;
 	}
 
       if (good_epsv)
 	{
-	  /* EPSV: IPv4
+	  /* EPSV: IPv4 or IPv6
 	   *
 	   * Expected response (perl): pasv =~ '%u|'
 	   * This communicates a port number.
@@ -1193,11 +1212,14 @@ initconn (void)
 	      case AF_INET:
 		data_addr_sa4->sin_port = htons (port);
 		break;
+	      case AF_INET6:
+		data_addr_sa6->sin6_port = htons (port);
+		break;
 	    }
 	} /* EPSV */
       else if (good_lpsv)
 	{
-	  /* LPSV: IPv4
+	  /* LPSV: IPv4 or IPv6
 	   *
 	   * At this point we have got a string of comma
 	   * separated, one-byte unsigned integer values.
@@ -1229,7 +1251,37 @@ initconn (void)
 		  uint32_t *pu32 = (uint32_t *) &data_addr_sa4->sin_addr.s_addr;
 		  pu32[0] = htonl ( (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3]);
 		}
-	    }
+	    } /* LPSV IPv4 */
+	  else /* IPv6 */
+	    {
+	      if ((sscanf (pasv, "%u," /* af */
+				"%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u," /* hal, h[16] */
+				"%u,%u,%u", /* pal, p0, p1 */
+				&af, &hal, &h[0], &h[1], &h[2], &h[3], &h[4], &h[5], &h[6], &h[7],
+				&h[8], &h[9], &h[10], &h[11], &h[12], &h[13], &h[14], &h[15],
+				&pal, &p0, &p1) != 21)
+		  || (/* Strong checking */ af != 6 || hal != 16 || pal != 2) )
+		{
+		  printf ("Passive mode address scan failure. "
+			  "Shouldn't happen!\n");
+		  (void) command ("ABOR");	/* Cancel any open connection.  */
+		  goto bad;
+		}
+	      for (j = 0; j < 16; ++j)
+		h[j] &= 0xff; /* Mask only the significant bits.  */
+
+	      data_addr.ss_family = AF_INET6;
+	      data_addr_sa6->sin6_port =
+		  htons (((p0 & 0xff) << 8) | (p1 & 0xff));
+
+		{
+		  uint32_t *pu32 = (uint32_t *) &data_addr_sa6->sin6_addr.s6_addr;
+		  pu32[0] = htonl ( (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3]);
+		  pu32[1] = htonl ( (h[4] << 24) | (h[5] << 16) | (h[6] << 8) | h[7]);
+		  pu32[2] = htonl ( (h[8] << 24) | (h[9] << 16) | (h[10] << 8) | h[11]);
+		  pu32[3] = htonl ( (h[12] << 24) | (h[13] << 16) | (h[14] << 8) | h[15]);
+		}
+	    } /* LPSV IPv6 */
 	}
       else /* !EPSV && !LPSV */
 	{ /* PASV */
@@ -1282,6 +1334,9 @@ noport:
 	case AF_INET:
 	  data_addr_sa4->sin_port = 0;
 	  break;
+	case AF_INET6:
+	  data_addr_sa6->sin6_port = 0;
+	  break;
       }
 
   if (data != -1)
@@ -1322,6 +1377,7 @@ noport:
 #define UC(b)	(((int)b)&0xff)
       /* Preferences:
        *   IPv4: EPRT, PORT, LPRT
+       *   IPv6: EPRT, LPRT
        */
       result = ERROR;	/* For success detection.  */
       if (data_addr.ss_family != AF_INET || doepsv4)
@@ -1362,6 +1418,16 @@ noport:
 		result = command ("LPRT 4,4,%u,%u,%u,%u,2,%u,%u",
 				  h[0], h[1], h[2], h[3], p[0], p[1]);
 		break;
+	      case AF_INET6:
+		h = (uint8_t *) &data_addr_sa6->sin6_addr;
+		p = (uint8_t *) &data_addr_sa6->sin6_port;
+		result = command ("LPRT 6,16," /* af, hal */
+				  "%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u,%u," /* h[16] */
+				  "2,%u,%u", /* pal, p[2] */
+				  h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7],
+				  h[8], h[9], h[10], h[11], h[12], h[13], h[14], h[15],
+				  p[0], p[1]);
+		break;
 	    }
 	}
 
diff --git a/ftp/ftp_var.h b/ftp/ftp_var.h
index 52212ee..601b0bf 100644
--- a/ftp/ftp_var.h
+++ b/ftp/ftp_var.h
@@ -88,6 +88,7 @@ FTP_EXTERN int crflag;		/* if 1, strip car. rets. on ascii gets */
 FTP_EXTERN char pasv[64];	/* passive port for proxy data connection */
 FTP_EXTERN int passivemode;	/* passive mode enabled */
 FTP_EXTERN int doepsv4;		/* EPSV/EPRT for IPv4 enabled */
+FTP_EXTERN int usefamily;	/* Precondition on an adress family */
 FTP_EXTERN char *altarg;	/* argv[1] with no shell-like preprocessing  */
 FTP_EXTERN char ntin[17];	/* input translation table */
 FTP_EXTERN char ntout[17];	/* output translation table */
diff --git a/ftp/main.c b/ftp/main.c
index 147f66f..38e36f0 100644
--- a/ftp/main.c
+++ b/ftp/main.c
@@ -108,6 +108,8 @@ static struct argp_option argp_options[] = {
   {"prompt", OPT_PROMPT, "PROMPT", OPTION_ARG_OPTIONAL, "print a command line PROMPT "
    "(optionally), even if not on a tty", GRP+1},
   {"verbose", 'v', NULL, 0, "verbose output", GRP+1},
+  {"ipv4", '4', NULL, 0, "contact IPv4 hosts", GRP+1},
+  {"ipv6", '6', NULL, 0, "contact IPv6 hosts", GRP+1},
 #undef GRP
   {NULL}
 };
@@ -154,6 +156,14 @@ parse_opt (int key, char *arg, struct argp_state *state)
       passivemode = 0;
       break;
 
+    case '4':
+      usefamily = AF_INET;
+      break;
+
+    case '6':
+      usefamily = AF_INET6;
+      break;
+
     default:
       return ARGP_ERR_UNKNOWN;
     }
@@ -179,6 +189,7 @@ main (int argc, char *argv[])
   autologin = 1;
   passivemode = 0;		/* passive mode not active */
   doepsv4 = 0;			/* use EPRT/EPSV for IPv4 */
+  usefamily = AF_UNSPEC;	/* allow any address family */
 
   /* Parse command line */
   iu_argp_init ("ftp", default_program_authors);

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

Summary of changes:
 ChangeLog     |   12 +++++++++
 ftp/ftp.c     |   76 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 ftp/ftp_var.h |    1 +
 ftp/main.c    |   11 ++++++++
 4 files changed, 95 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Fri May 06 13:26:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QIOnS-0005o5-JQ
	for mharc-commit-inetutils@gnu.org; Fri, 06 May 2011 13:26:34 -0400
Received: from eggs.gnu.org ([140.186.70.92]:43130)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIOnQ-0005no-01
	for commit-inetutils@gnu.org; Fri, 06 May 2011 13:26:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIOnO-0002mr-CT
	for commit-inetutils@gnu.org; Fri, 06 May 2011 13:26:31 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57802)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIOnO-0002mn-Am
	for commit-inetutils@gnu.org; Fri, 06 May 2011 13:26:30 -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 1QIOnN-0005Vi-RU
	for commit-inetutils@gnu.org; Fri, 06 May 2011 17:26:29 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1QIOnN-00088l-Lb
	for commit-inetutils@gnu.org; Fri, 06 May 2011 17:26:29 +0000
Date: Fri, 06 May 2011 17:26:29 +0000
Message-Id: <E1QIOnN-00088l-Lb@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-88-g46dedcf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6406851b3fb6cf4d396c49c7f2143369d7bd4a0e
X-Git-Newrev: 46dedcf228def17144eff9a063fb6b249146577e
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: Fri, 06 May 2011 17:26:33 -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  46dedcf228def17144eff9a063fb6b249146577e (commit)
      from  6406851b3fb6cf4d396c49c7f2143369d7bd4a0e (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=46dedcf228def17144eff9a063fb6b249146577e


commit 46dedcf228def17144eff9a063fb6b249146577e
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 6 16:37:42 2011 +0200

    syslogd: Fix memory leaks related to action fields.

diff --git a/ChangeLog b/ChangeLog
index 31a9a84..f4a39a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
+
+	* src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or F_FNAME
+	when F_TYPE is invalidated as F_UNUSED.
+	(cfline): Likewise.
+	(init): Deallocate F_FNAME, F_HNAME, F_UNAMES, and F_PREVHOST before
+	reclaiming the pointer F.
+
 2011-04-17  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* ftp/ftp_var.h (usefamily): New variable.
diff --git a/src/syslogd.c b/src/syslogd.c
index 10a13a0..5927f9f 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1211,7 +1211,11 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
 	      dbg_printf ("Failure: %s\n", hstrerror (h_errno));
 	      dbg_printf ("Retries: %d\n", f->f_prevcount);
 	      if (--f->f_prevcount < 0)
-		f->f_type = F_UNUSED;
+		{
+		  f->f_type = F_UNUSED;
+		  free (f->f_un.f_forw.f_hname);
+		  f->f_un.f_forw.f_hname = NULL;
+		}
 	    }
 	  else
 	    {
@@ -1301,6 +1305,8 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
 		{
 		  f->f_type = F_UNUSED;
 		  logerror (f->f_un.f_fname);
+		  free (f->f_un.f_fname);
+		  f->f_un.f_fname = NULL;
 		}
 	      else
 		goto again;
@@ -1310,6 +1316,8 @@ fprintlog (struct filed *f, const char *from, int flags, const char *msg)
 	      f->f_type = F_UNUSED;
 	      errno = e;
 	      logerror (f->f_un.f_fname);
+	      free (f->f_un.f_fname);
+	      f->f_un.f_fname = NULL;
 	    }
 	}
       else if ((flags & SYNC_FILE) && !(f->f_flags & OMIT_SYNC))
@@ -1571,6 +1579,8 @@ init (int signo ARG_UNUSED)
   Initialized = 0;
   for (f = Files; f != NULL; f = next)
     {
+      int j;
+
       /* Flush any pending output.  */
       if (f->f_prevcount)
 	fprintlog (f, LocalHostName, 0, (char *) NULL);
@@ -1581,9 +1591,22 @@ init (int signo ARG_UNUSED)
 	case F_TTY:
 	case F_CONSOLE:
 	case F_PIPE:
+	  free (f->f_un.f_fname);
 	  close (f->f_file);
 	  break;
+	case F_FORW:
+	case F_FORW_SUSP:
+	case F_FORW_UNKN:
+	  free (f->f_un.f_forw.f_hname);
+	  break;
+	case F_USERS:
+	  for (j = 0; j < f->f_un.f_user.f_nusers; ++j)
+	    free (f->f_un.f_user.f_unames[j]);
+	  free (f->f_un.f_user.f_unames);
+	  break;
 	}
+      if (f->f_prevhost)
+	free (f->f_prevhost);
       next = f->f_next;
       free (f);
     }
@@ -1915,6 +1938,8 @@ cfline (const char *line, struct filed *f)
 	{
 	  f->f_type = F_UNUSED;
 	  logerror (p);
+	  free (f->f_un.f_fname);
+	  f->f_un.f_fname = NULL;
 	  break;
 	}
       if (strcmp (p, ctty) == 0)
@@ -1931,6 +1956,8 @@ cfline (const char *line, struct filed *f)
 	{
 	  f->f_type = F_UNUSED;
 	  logerror (p);
+	  free (f->f_un.f_fname);
+	  f->f_un.f_fname = NULL;
 	  break;
 	}
       if (strcmp (p, ctty) == 0)

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

Summary of changes:
 ChangeLog     |    8 ++++++++
 src/syslogd.c |   29 ++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Sat May 07 13:32:34 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QIlMo-0002nt-EV
	for mharc-commit-inetutils@gnu.org; Sat, 07 May 2011 13:32:34 -0400
Received: from eggs.gnu.org ([140.186.70.92]:52882)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIlMk-0002nJ-V9
	for commit-inetutils@gnu.org; Sat, 07 May 2011 13:32:33 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIlMj-0005fQ-A8
	for commit-inetutils@gnu.org; Sat, 07 May 2011 13:32:30 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38895)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gnu@gisladisker.se>) id 1QIlMj-0005fM-8O
	for commit-inetutils@gnu.org; Sat, 07 May 2011 13:32:29 -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 1QIlMi-00059a-T8
	for commit-inetutils@gnu.org; Sat, 07 May 2011 17:32:29 +0000
Received: from meand by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <meand@savannah.gnu.org>) id 1QIlMi-0003jc-EP
	for commit-inetutils@gnu.org; Sat, 07 May 2011 17:32:28 +0000
Date: Sat, 07 May 2011 17:32:28 +0000
Message-Id: <E1QIlMi-0003jc-EP@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-90-gc232042
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 46dedcf228def17144eff9a063fb6b249146577e
X-Git-Newrev: c23204251c56d6d860e4909cbef9e4094b6082b7
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: Sat, 07 May 2011 17:32:33 -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  c23204251c56d6d860e4909cbef9e4094b6082b7 (commit)
       via  faa916c08a33b508648932f43696446fcdde9419 (commit)
      from  46dedcf228def17144eff9a063fb6b249146577e (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=c23204251c56d6d860e4909cbef9e4094b6082b7


commit c23204251c56d6d860e4909cbef9e4094b6082b7
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 6 20:22:28 2011 +0200

    inetutils.texi: Add IPv6 ability for FTP client.

diff --git a/ChangeLog b/ChangeLog
index 5e1a6db..f7a4468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* doc/inetutils.texi (ftp invocation): Document new capabilities
+	related to the recent IPv6 code.  A single old misprint.
+
+2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* ftp/extern.h (setipany,setipv4,setipv6): New prototypes.
 	* ftp/cmdtab.c (ipanyhelp,ipv4help,ipv6help): New help texts.
 	(cmdtab): Register commands `ipany', `ipv4', and `ipv6'.
diff --git a/doc/inetutils.texi b/doc/inetutils.texi
index 19e5f88..de80015 100644
--- a/doc/inetutils.texi
+++ b/doc/inetutils.texi
@@ -794,8 +794,20 @@ ftp [@var{option}@dots{}] [@var{host} [@var{port}]]
 @end example
 
 @table @option
+@item -4
+@itemx --ipv4
+@opindex -4
+@opindex --ipv4
+Initially set addressing to IPv4 only.
+
+@item -6
+@itemx --ipv6
+@opindex -6
+@opindex --ipv6
+Initially set addressing to IPv6 only.
+
 @item -A
-@itemx --acctive
+@itemx --active
 @opindex -A
 @opindex --active
 Enable active mode transfer.
@@ -961,6 +973,9 @@ the current working directory on the remote machine is used.  If no
 local file is specified, or @var{local-file} is @samp{-}, output comes
 to the terminal.
 
+@item epsv4
+Toggle the use of EPSV/EPRT for IPv4 addressing.  Default is off.
+
 @item form @var{format}
 Set the file transfer form to @var{format}.  The default format is
 @samp{file}.
@@ -1007,6 +1022,15 @@ Set the inactivity timer on the remote server to @var{seconds}
 seconds.  If seconds is omitted, the current inactivity timer is
 printed.
 
+@item ipv4
+Select IPv4 as the only addressing scheme.
+
+@item ipv6
+Select IPv6 as the only addressing scheme.
+
+@item ipany
+Allow IPv4 as well as IPv6 addressing.
+
 @item lcd [@var{directory}]
 Change the working directory on the local machine.  If no directory is
 specified, the user's home directory is used.
@@ -1175,7 +1199,10 @@ sends that address to the remote server, who connects back to it.
 Passive mode is useful when using @command{ftp} through a gateway
 router or host that controls the directionality of traffic.  (Note
 that though @command{ftp} servers are required to support the
-@code{PASV} command by RFC 1123, some do not.)
+@code{PASV} command by RFC 1123, some do not.)  If @command{epsv4}
+has been set to on, the client will attempt @code{EPSV} before
+@code{PASV} for IPv4.  As a last resort @code{LPSV} is attempted.
+With IPv6 only @code{EPSV} and @code{LPSV} are possible.
 
 @item prompt
 Toggle interactive prompting.  Interactive prompting occurs during

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=faa916c08a33b508648932f43696446fcdde9419


commit faa916c08a33b508648932f43696446fcdde9419
Author: Mats Erik Andersson <gnu@gisladisker.se>
Date:   Fri May 6 20:09:08 2011 +0200

    ftp: Commands for address family selection.

diff --git a/ChangeLog b/ChangeLog
index f4a39a6..5e1a6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
+	* ftp/extern.h (setipany,setipv4,setipv6): New prototypes.
+	* ftp/cmdtab.c (ipanyhelp,ipv4help,ipv6help): New help texts.
+	(cmdtab): Register commands `ipany', `ipv4', and `ipv6'.
+	* ftp/cmds.c (status): Report address family.
+	(setipany,setipv4,setipv6): New functions.
+
+2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
+
 	* src/syslogd.c (fprintlog): Deallocate pointers F_HNAME or F_FNAME
 	when F_TYPE is invalidated as F_UNUSED.
 	(cfline): Likewise.
diff --git a/ftp/cmds.c b/ftp/cmds.c
index 39b6294..4a97f26 100644
--- a/ftp/cmds.c
+++ b/ftp/cmds.c
@@ -1053,6 +1053,9 @@ status (int argc, char **argv)
     printf ("Connected to %s.\n", hostname);
   else
     printf ("Not connected.\n");
+  printf ("Connection addressing: %s\n",
+	  (usefamily == AF_UNSPEC) ? "any"
+	    : (usefamily == AF_INET6) ? "IPv6" : "IPv4");
   if (!proxy)
     {
       pswitch (1);
@@ -1158,6 +1161,39 @@ setverbose (int argc, char **argv)
 }
 
 /*
+ * Allow any address family.
+ */
+void
+setipany (int argc, char **argv)
+{
+  usefamily = AF_UNSPEC;
+  printf ("Selecting addresses: %s.\n", "any");
+  code = usefamily;
+}
+
+/*
+ * Restrict to IPv4 addresses.
+ */
+void
+setipv4 (int argc, char **argv)
+{
+  usefamily = AF_INET;
+  printf ("Selecting addresses: %s.\n", "IPv4");
+  code = usefamily;
+}
+
+/*
+ * Restrict to IPv6 addresses.
+ */
+void
+setipv6 (int argc, char **argv)
+{
+  usefamily = AF_INET6;
+  printf ("Selecting addresses: %s.\n", "IPv6");
+  code = usefamily;
+}
+
+/*
  * Toggle use of EPRT/EPRT for IPv4.
  */
 void
diff --git a/ftp/cmdtab.c b/ftp/cmdtab.c
index 8910cf0..65d2096 100644
--- a/ftp/cmdtab.c
+++ b/ftp/cmdtab.c
@@ -80,6 +80,9 @@ char globhelp[] = "toggle metacharacter expansion of local file names";
 char hashhelp[] = "toggle printing `#' for each buffer transferred";
 char helphelp[] = "print local help information";
 char idlehelp[] = "get (set) idle timer on remote side";
+char ipanyhelp[] = "allow all address families";
+char ipv4help[] = "select only IPv4 addresses";
+char ipv6help[] = "select only IPv6 addresses";
 char lcdhelp[] = "change local working directory";
 char lshelp[] = "list contents of remote directory";
 char macdefhelp[] = "define a macro";
@@ -154,6 +157,9 @@ static struct cmd cmdtab[] = {
   {"help", helphelp, 0, 0, 1, help},
   {"idle", idlehelp, 0, 1, 1, site_idle},
   {"image", binaryhelp, 0, 1, 1, setbinary},
+  {"ipany", ipanyhelp, 0, 0, 0, setipany},
+  {"ipv4", ipv4help, 0, 0, 0, setipv4},
+  {"ipv6", ipv6help, 0, 0, 0, setipv6},
   {"lcd", lcdhelp, 0, 0, 0, lcd},
   {"ls", lshelp, 1, 1, 1, ls},
   {"macdef", macdefhelp, 0, 0, 0, macdef},
diff --git a/ftp/extern.h b/ftp/extern.h
index 1c4719f..39bff6f 100644
--- a/ftp/extern.h
+++ b/ftp/extern.h
@@ -132,6 +132,9 @@ void setform (int, char **);
 void setftmode (int, char **);
 void setglob (int, char **);
 void sethash (int, char **);
+void setipany (int, char **);
+void setipv4 (int, char **);
+void setipv6 (int, char **);
 void setnmap (int, char **);
 void setntrans (int, char **);
 void setpassive (int, char **);

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

Summary of changes:
 ChangeLog          |   13 +++++++++++++
 doc/inetutils.texi |   31 +++++++++++++++++++++++++++++--
 ftp/cmds.c         |   36 ++++++++++++++++++++++++++++++++++++
 ftp/cmdtab.c       |    6 ++++++
 ftp/extern.h       |    3 +++
 5 files changed, 87 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon May 09 06:37:42 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QJNqQ-0002Xs-Bn
	for mharc-commit-inetutils@gnu.org; Mon, 09 May 2011 06:37:42 -0400
Received: from eggs.gnu.org ([140.186.70.92]:39671)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJNqO-0002XT-94
	for commit-inetutils@gnu.org; Mon, 09 May 2011 06:37:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJNqN-0007jJ-1k
	for commit-inetutils@gnu.org; Mon, 09 May 2011 06:37:40 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:40544)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJNqM-0007jE-VE
	for commit-inetutils@gnu.org; Mon, 09 May 2011 06:37:39 -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 <simon@josefsson.org>) id 1QJNqM-0008Ig-Ji
	for commit-inetutils@gnu.org; Mon, 09 May 2011 10:37:38 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jas@savannah.gnu.org>) id 1QJNqM-0006wX-D1
	for commit-inetutils@gnu.org; Mon, 09 May 2011 10:37:38 +0000
Date: Mon, 09 May 2011 10:37:38 +0000
Message-Id: <E1QJNqM-0006wX-D1@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-91-g390e321
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c23204251c56d6d860e4909cbef9e4094b6082b7
X-Git-Newrev: 390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4
From: Simon Josefsson <simon@josefsson.org>
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: Mon, 09 May 2011 10:37: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  390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4 (commit)
      from  c23204251c56d6d860e4909cbef9e4094b6082b7 (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=390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4


commit 390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon May 9 12:37:30 2011 +0200

    bootstrap.conf (gnulib_modules): Removed 'exit' from list.

diff --git a/ChangeLog b/ChangeLog
index f7a4468..0ebc505 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-05-09  Simon Josefsson  <simon@josefsson.org>
+
+	* bootstrap.conf (gnulib_modules): Removed 'exit' from list.
+
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
 	* doc/inetutils.texi (ftp invocation): Document new capabilities
diff --git a/bootstrap.conf b/bootstrap.conf
index 980d158..8defefe 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -30,7 +30,6 @@ autobuild
 dirfd
 dirname-lgpl
 error
-exit
 exitfail
 extensions
 fdl-1.3

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

Summary of changes:
 ChangeLog      |    4 ++++
 bootstrap.conf |    1 -
 2 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


From MAILER-DAEMON Mon May 09 10:10:19 2011
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1QJRAB-0006ju-Jt
	for mharc-commit-inetutils@gnu.org; Mon, 09 May 2011 10:10:19 -0400
Received: from eggs.gnu.org ([140.186.70.92]:44290)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJRA2-0006jc-Ok
	for commit-inetutils@gnu.org; Mon, 09 May 2011 10:10:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJR9y-0001Oi-AT
	for commit-inetutils@gnu.org; Mon, 09 May 2011 10:10:10 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38643)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <simon@josefsson.org>) id 1QJR9y-0001OY-7h
	for commit-inetutils@gnu.org; Mon, 09 May 2011 10:10:06 -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 <simon@josefsson.org>) id 1QJR9v-0002Ko-Kc
	for commit-inetutils@gnu.org; Mon, 09 May 2011 14:10:04 +0000
Received: from jas by vcs-noshell.in.savannah.gnu.org with local (Exim 4.72)
	(envelope-from <jas@savannah.gnu.org>) id 1QJR9t-0000zY-FI
	for commit-inetutils@gnu.org; Mon, 09 May 2011 14:10:03 +0000
Date: Mon, 09 May 2011 14:10:01 +0000
Message-Id: <E1QJR9t-0000zY-FI@vcs-noshell.in.savannah.gnu.org>
To: commit-inetutils@gnu.org
Subject: [SCM] GNU Inetutils  branch, master,
	updated. inetutils-1_8-92-gc82c642
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4
X-Git-Newrev: c82c64249d4c022b6b1c96ae1a828c411be3a5aa
From: Simon Josefsson <simon@josefsson.org>
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: Mon, 09 May 2011 14:10:18 -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  c82c64249d4c022b6b1c96ae1a828c411be3a5aa (commit)
      from  390e3210d19b2ea4f9c7e43d87d4fbc135bb36a4 (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=c82c64249d4c022b6b1c96ae1a828c411be3a5aa


commit c82c64249d4c022b6b1c96ae1a828c411be3a5aa
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon May 9 16:09:28 2011 +0200

    bootstrap.conf (gnulib_modules): Remove 'strcase' from list (not needed
    anymore, according to gnulib documentation).

diff --git a/ChangeLog b/ChangeLog
index 0ebc505..09cdd2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2011-05-09  Simon Josefsson  <simon@josefsson.org>
 
 	* bootstrap.conf (gnulib_modules): Removed 'exit' from list.
+	(gnulib_modules): Remove 'strcase' from list (not needed anymore,
+	according to gnulib documentation).
 
 2011-05-06  Mats Erik Andersson <gnu@gisladisker.se>
 
diff --git a/bootstrap.conf b/bootstrap.conf
index 8defefe..880ce11 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -66,7 +66,6 @@ size_max
 snprintf
 stdbool
 stdint
-strcase
 strchrnul
 strerror
 strndup

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

Summary of changes:
 ChangeLog      |    2 ++
 bootstrap.conf |    1 -
 2 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU Inetutils 


