passfd module, part 1.

* m4/afunix.m4: New file.
* m4/sockpfaf.m4 (gl_SOCKET_FAMILIES): Also test for UNIX domain
sockets.

diff --git a/ChangeLog b/ChangeLog
index d93ea69284af58ab9a7d51e8746d766aaed31ffb..a84346a091c5dc38beb4cb29b10f18f697422d83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-07  Bastien Roucariès  <roucaries.bastien@gmail.com>
+
+       passfd module, part 1.
+       * m4/afunix.m4: New file.
+       * m4/sockpfaf.m4 (gl_SOCKET_FAMILIES): Also test for UNIX domain
+       sockets.
+
 2011-03-08  Bruno Haible  <bruno@clisp.org>
 
        regex-quote: New API.

diff --git a/m4/afunix.m4 b/m4/afunix.m4
new file mode 100644 (file)
index 0000000..760c494
--- /dev/null
+++ b/m4/afunix.m4
@@ -0,0 +1,95 @@
+# afunix.m4 serial 1
+dnl Copyright (C) 2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([gl_SOCKET_AFUNIX],
+[
+  AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+  AC_REQUIRE([gl_SOCKET_FAMILIES])
+
+  AC_MSG_CHECKING([for UNIX domain sockets SCM_RIGHT])
+  AC_CACHE_VAL([gl_cv_socket_unix_scm_rights],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+]],
+[[struct cmsghdr cmh;
+  cmh.cmsg_level = SOL_SOCKET;
+  cmh.cmsg_type = SCM_RIGHTS;
+  if (&cmh) return 0;]])],
+  gl_cv_socket_unix_scm_rights=yes, gl_cv_socket_unix_scm_rights=no)])
+  AC_MSG_RESULT([$gl_cv_socket_unix_scm_rights])
+  if test $gl_cv_socket_unix_scm_rights = yes; then
+    AC_DEFINE([HAVE_UNIXSOCKET_SCM_RIGHTS], [1], [Define to 1 if <sys/socket.h> defines SCM_RIGHTS.])
+  fi 
+
+  AC_MSG_CHECKING([for UNIX domain sockets SCM_RIGHT behave in BSD4.4 way])
+  AC_CACHE_VAL([gl_cv_socket_unix_scm_rights_bsd44_way],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+]],
+[[struct msghdr msg = {0};
+  struct cmsghdr *cmsg;
+  int myfds[1] = {0};
+  char buf[CMSG_SPACE(sizeof(myfds))];
+  int *fdptr;
+
+  msg.msg_control = buf;
+  msg.msg_controllen = sizeof buf;
+  cmsg = CMSG_FIRSTHDR(&msg);
+  cmsg->cmsg_level = SOL_SOCKET;
+  cmsg->cmsg_type = SCM_RIGHTS;
+  cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+  /* fake Initialize the payload: */
+  (void) CMSG_DATA(cmsg);
+  /* Sum of the length of all control messages in the buffer: */
+  msg.msg_controllen = cmsg->cmsg_len;
+  return 0;
+]])],
+  gl_cv_socket_unix_scm_rights_bsd44_way=yes, gl_cv_socket_unix_scm_rights_bsd44_way=no)])
+  AC_MSG_RESULT([$gl_cv_socket_unix_scm_rights_bsd44_way])
+  if test $gl_cv_socket_unix_scm_rights_bsd44_way = yes; then
+    AC_DEFINE([HAVE_UNIXSOCKET_SCM_RIGHTS_BSD44_WAY], [1], [Define to 1 if fd could be send/received in the BSD4.4 way.])
+  fi
+
+  AC_MSG_CHECKING([for UNIX domain sockets SCM_RIGHT behave in BSD4.3 way])
+  AC_CACHE_VAL([gl_cv_socket_unix_scm_rights_bsd43_way],
+  [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif
+]],
+[[struct msghdr msg;
+  int fd = 0;
+  msg.msg_accrights = &fd;
+  msg.msg_accrightslen = sizeof(fd);
+  if (&msg) return 0;]])],
+  gl_cv_socket_unix_scm_rights_bsd43_way=yes, gl_cv_socket_unix_scm_rights_bsd43_way=no)])
+  AC_MSG_RESULT([$gl_cv_socket_unix_scm_rights_bsd43_way])
+  if test $gl_cv_socket_unix_scm_rights_bsd43_way = yes; then
+    AC_DEFINE([HAVE_UNIXSOCKET_SCM_RIGHTS_BSD43_WAY], [1], [Define to 1 if fd could be send/received in the BSD4.3 way.])
+  fi
+])

diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4
index 27899aa59be97104917a94ce05923d4ab45ffbbe..b8a64ad9919dc34220fc80340f19f14e9650724f 100644 (file)
--- a/m4/sockpfaf.m4
+++ b/m4/sockpfaf.m4
@@ -1,4 +1,4 @@
-# sockpfaf.m4 serial 7
+# sockpfaf.m4 serial 8
 dnl Copyright (C) 2004, 2006, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -58,4 +58,25 @@ AC_DEFUN([gl_SOCKET_FAMILIES],
   if test $gl_cv_socket_ipv6 = yes; then
     AC_DEFINE([HAVE_IPV6], [1], [Define to 1 if <sys/socket.h> defines AF_INET6.])
   fi
+
+  AC_CHECK_HEADERS_ONCE([sys/un.h])
+  AC_MSG_CHECKING([for UNIX domain sockets])
+  AC_CACHE_VAL([gl_cv_socket_unix],
+    [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_SYS_UN_H
+#include <sys/un.h>
+#endif
+#ifdef HAVE_WINSOCK2_H
+#include <winsock2.h>
+#endif]],
+[[int x = AF_UNIX; struct sockaddr_un y;
+ if (&x && &y) return 0;]])],
+       gl_cv_socket_unix=yes, gl_cv_socket_unix=no)])
+  AC_MSG_RESULT([$gl_cv_socket_unix])
+  if test $gl_cv_socket_unix = yes; then
+    AC_DEFINE([HAVE_UNIXSOCKET], [1], [Define to 1 if <sys/socket.h> defines AF_UNIX.])
+  fi
 ])