2.1.9 patches

[Albert Chin]

1. [src/methods.c]
   No C++ comments in C source files. Some vendor C compilers do not
   accept this.
2. [configure.ac, acconfig.h, src/nameinfo.c]
   As you are using autoconf-2.5, why not use AC_CHECK_MEMBERS()
   to determine if struct sockaddr has sa_len?

-- 
albert chin (china@thewrittenword.com)

-- snip snip
--- src/methods.c.orig  2004-08-11 10:45:55.000000000 -0500
+++ src/methods.c       2004-08-11 10:46:01.000000000 -0500
@@ -629,7 +629,7 @@
    strncpy(ipaddress,"localhost",63);     
    }
 
-// REPLACE BY METHODCLIENTIP, METHOD
+/* REPLACE BY METHODCLIENTIP, METHOD */
 
 
snprintf(basepackage,CF_BUFSIZE-1,"%s/rpc_in/%s_%s_%s_%s",VLOCKDIR,clientip,ipaddress,METHODNAME,METHODMD5);
 
--- acconfig.h.orig     2004-07-30 07:34:41.000000000 -0500
+++ acconfig.h  2004-08-11 10:20:12.000000000 -0500
@@ -23,9 +23,6 @@
 
 */
 @TOP@
-/* Do we have a variable sized struct sockaddr ? */
-#undef SOCKADDR_HAS_SA_LEN
-
 /* The old route entry structure in newer BSDs */
 #undef HAVE_ORTENTRY
 
--- configure.ac.orig   Mon Aug  9 12:27:15 2004
+++ a   Wed Aug 11 17:31:31 2004
@@ -382,20 +382,9 @@
 dnl Check for sa_len in struct sockaddr
 dnl ######################################################################
 
-AC_MSG_CHECKING(for sa_len in struct sockaddr)
-dnl AC_CACHE_VAL(ac_cv_struct_sockaddr_sa_len, [
-AC_TRY_COMPILE([
+AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [
 #include <sys/types.h>
-#include <sys/socket.h>
-],[
-struct sockaddr sa;
-int foo = sa.sa_len;
-], ac_cv_struct_sockaddr_sa_len=yes, ac_cv_struct_sockaddr_sa_len=no)
-dnl ], ac_cv_struct_sockaddr_sa_len=yes, ac_cv_struct_sockaddr_sa_len=no)])
-if test "$ac_cv_struct_sockaddr_sa_len" = yes; then
-   AC_DEFINE(SOCKADDR_HAS_SA_LEN)
-fi
-AC_MSG_RESULT([$ac_cv_struct_sockaddr_sa_len])
+#include <sys/socket.h>])
    
 dnl #######################################################################
 dnl Newer BSD systems don't have a compatible rtentry - use ortentry
--- src/nameinfo.c.orig 2004-08-11 10:20:44.000000000 -0500
+++ src/nameinfo.c      2004-08-11 10:20:54.000000000 -0500
@@ -37,7 +37,7 @@
 #include <sys/syssgi.h>
 #endif
 
-#ifdef SOCKADDR_HAS_SA_LEN
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
 # ifdef _SIZEOF_ADDR_IFREQ
 #  define SIZEOF_IFREQ(x) _SIZEOF_ADDR_IFREQ(x)
 # else