From d4aed48135e49855b54dc9184d0d5f3ea693c616 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Wed, 5 Dec 2007 00:15:25 +0000
Subject: [PATCH] Rename HAVE_STRUCT_SOCKADDR_SA_LEN to
 HAVE_STRUCT_SOCKADDR_IN_SIN_LEN to accurately reflect the structure member
 being used.

---
 usr.bin/ftp/ftp.c     | 10 +++++-----
 usr.bin/ftp/ftp_var.h |  4 ++--
 usr.bin/ftp/version.h |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/usr.bin/ftp/ftp.c b/usr.bin/ftp/ftp.c
index aa44ff45f384..281ecbc1625a 100644
--- a/usr.bin/ftp/ftp.c
+++ b/usr.bin/ftp/ftp.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp.c,v 1.152 2007/07/22 05:02:50 lukem Exp $	*/
+/*	$NetBSD: ftp.c,v 1.153 2007/12/05 00:15:25 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@
 #if 0
 static char sccsid[] = "@(#)ftp.c	8.6 (Berkeley) 10/27/94";
 #else
-__RCSID("$NetBSD: ftp.c,v 1.152 2007/07/22 05:02:50 lukem Exp $");
+__RCSID("$NetBSD: ftp.c,v 1.153 2007/12/05 00:15:25 lukem Exp $");
 #endif
 #endif /* not lint */
 
@@ -146,12 +146,12 @@ struct sockinet {
 		struct sockaddr_in6 su_sin6;
 #endif
 	} si_su;
-#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if !defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
 	int	si_len;
 #endif
 };
 
-#if !defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if !defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
 # define su_len		si_len
 #else
 # define su_len		si_su.su_sin.sin_len
@@ -2114,7 +2114,7 @@ ai_unmapped(struct addrinfo *ai)
 	sin.sin_port = sin6->sin6_port;
 
 	ai->ai_family = AF_INET;
-#if defined(HAVE_STRUCT_SOCKADDR_SA_LEN)
+#if defined(HAVE_STRUCT_SOCKADDR_IN_SIN_LEN)
 	sin.sin_len = len;
 #endif
 	memcpy(ai->ai_addr, &sin, len);
diff --git a/usr.bin/ftp/ftp_var.h b/usr.bin/ftp/ftp_var.h
index 990420ead315..0fbce907cf53 100644
--- a/usr.bin/ftp/ftp_var.h
+++ b/usr.bin/ftp/ftp_var.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ftp_var.h,v 1.75 2007/07/22 05:02:50 lukem Exp $	*/
+/*	$NetBSD: ftp_var.h,v 1.76 2007/12/05 00:15:25 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1996-2007 The NetBSD Foundation, Inc.
@@ -328,7 +328,7 @@ extern	struct option	optiontab[];
 #define	FREEPTR(x)	if ((x) != NULL) { free(x); (x) = NULL; }
 
 #ifdef BSD4_4
-# define HAVE_STRUCT_SOCKADDR_SA_LEN	1
+# define HAVE_STRUCT_SOCKADDR_IN_SIN_LEN	1
 #endif
 
 #ifdef NO_LONG_LONG
diff --git a/usr.bin/ftp/version.h b/usr.bin/ftp/version.h
index e42140f9f0dc..dfcd40b93bb7 100644
--- a/usr.bin/ftp/version.h
+++ b/usr.bin/ftp/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.70 2007/08/22 06:51:41 lukem Exp $	*/
+/*	$NetBSD: version.h,v 1.71 2007/12/05 00:15:25 lukem Exp $	*/
 /*-
  * Copyright (c) 1999-2007 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -40,5 +40,5 @@
 #endif
 
 #ifndef FTP_VERSION
-#define	FTP_VERSION	"20070822"
+#define	FTP_VERSION	"20071205"
 #endif