From 50abba560c1a20ae2b88a0e4dbfc0d1f166588ea Mon Sep 17 00:00:00 2001
From: Kevin Steves <stevesk@pobox.com>
Date: Thu, 20 Sep 2001 19:43:41 +0000
Subject: [PATCH]  - (stevesk) sun_len, SUN_LEN() configure stuff no longer
 required

---
 ChangeLog    |  3 ++-
 acconfig.h   |  5 +----
 configure.in | 18 +-----------------
 defines.h    |  9 ++-------
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9d0c96232..883609ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20010920
  - (tim) [scard/Makefile.in] Don't strip the Java binary
+ - (stevesk) sun_len, SUN_LEN() configure stuff no longer required
 
 20010919
  - (bal) OpenBSD Sync
@@ -6533,4 +6534,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1549 2001/09/20 18:39:35 tim Exp $
+$Id: ChangeLog,v 1.1550 2001/09/20 19:43:41 stevesk Exp $
diff --git a/acconfig.h b/acconfig.h
index 2b2be91ab..0c1417885 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.116 2001/09/18 04:01:12 djm Exp $ */
+/* $Id: acconfig.h,v 1.117 2001/09/20 19:43:41 stevesk Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -32,9 +32,6 @@
 /* Define if your password has a pw_change field */
 #undef HAVE_PW_CHANGE_IN_PASSWD
 
-/* Define if your system's struct sockaddr_un has a sun_len member */
-#undef HAVE_SUN_LEN_IN_SOCKADDR_UN
-
 /* Define if you system's inet_ntoa is busted (e.g. Irix gcc issue) */
 #undef BROKEN_INET_NTOA
 
diff --git a/configure.in b/configure.in
index 038569bee..5fd7225c2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.312 2001/09/20 02:07:51 mouring Exp $
+# $Id: configure.in,v 1.313 2001/09/20 19:43:41 stevesk Exp $
 
 AC_INIT(ssh.c)
 
@@ -1167,22 +1167,6 @@ OSSH_CHECK_HEADER_FOR_FIELD(ut_time, utmpx.h, HAVE_TIME_IN_UTMPX)
 OSSH_CHECK_HEADER_FOR_FIELD(ut_tv, utmpx.h, HAVE_TV_IN_UTMPX)
 AC_STRUCT_ST_BLKSIZE
 
-AC_CACHE_CHECK([for sun_len field in struct sockaddr_un],
-		ac_cv_have_sun_len_in_struct_sockaddr_un, [
-	AC_TRY_COMPILE(
-		[
-#include <sys/types.h>
-#include <sys/socket.h>
-		],
-		[ struct sockaddr_un s; s.sun_len = 1; ],
-		[ ac_cv_have_sun_len_in_struct_sockaddr_un="yes" ],
-		[ ac_cv_have_sun_len_in_struct_sockaddr_un="no" ],
-	)
-])
-if test "x$ac_cv_have_sun_len_in_struct_sockaddr_un" = "xyes" ; then
-	AC_DEFINE(HAVE_SUN_LEN_IN_SOCKADDR_UN)
-fi
-
 AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
 		ac_cv_have_ss_family_in_struct_ss, [
 	AC_TRY_COMPILE(
diff --git a/defines.h b/defines.h
index 233e0b833..52cd41125 100644
--- a/defines.h
+++ b/defines.h
@@ -1,7 +1,7 @@
 #ifndef _DEFINES_H
 #define _DEFINES_H
 
-/* $Id: defines.h,v 1.71 2001/09/15 11:31:54 djm Exp $ */
+/* $Id: defines.h,v 1.72 2001/09/20 19:43:41 stevesk Exp $ */
 
 /* Necessary headers */
 
@@ -12,7 +12,7 @@
 #include <netinet/in.h> /* For IPv6 macros */
 #include <netinet/ip.h> /* For IPTOS macros */
 #ifdef HAVE_SYS_UN_H
-# include <sys/un.h> /* For SUN_LEN */
+# include <sys/un.h> /* For sockaddr_un */
 #endif
 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h> /* For u_intXX_t */
@@ -405,11 +405,6 @@ struct winsize {
 # define __attribute__(x)
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
-#ifndef SUN_LEN
-#define SUN_LEN(su) \
-	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
-#endif /* SUN_LEN */
-
 /* *-*-nto-qnx doesn't define this macro in the system headers */
 #ifdef MISSING_HOWMANY
 # define howmany(x,y)	(((x)+((y)-1))/(y))