summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-06-14 00:55:02 +0200
committerMichael Adam <obnox@samba.org>2014-06-16 18:18:04 +0200
commit0e9d4f68f94be4d187eb80429194267244861832 (patch)
tree763e8446e6c62bdfeb5ba2a40bd32a1ae817434d
parent4106cf2eb969da179720067c86728441442cde59 (diff)
downloadsamba-0e9d4f68f94be4d187eb80429194267244861832.zip
samba-0e9d4f68f94be4d187eb80429194267244861832.tar.gz
samba-0e9d4f68f94be4d187eb80429194267244861832.tar.xz
build: fix the test and define for msg_accrights
It must be "msg_accrights" not "msg_acctrights" ... ^ Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Autobuild-User(master): Michael Adam <obnox@samba.org> Autobuild-Date(master): Mon Jun 16 18:18:04 CEST 2014 on sn-devel-104
-rw-r--r--source3/modules/vfs_aio_fork.c2
-rw-r--r--source3/wscript10
2 files changed, 6 insertions, 6 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 97ec1cd..c1bded9 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -27,7 +27,7 @@
#include "lib/async_req/async_sock.h"
#include "lib/util/tevent_unix.h"
-#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS)
+#if !defined(HAVE_STRUCT_MSGHDR_MSG_CONTROL) && !defined(HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS)
# error Can not pass file descriptors
#endif
diff --git a/source3/wscript b/source3/wscript
index 819ea9b..6e76c86 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -561,11 +561,11 @@ msg.msg_controllen = sizeof(control_un.control);
conf.CHECK_CODE('''
struct msghdr msg;
int fd;
-msg.msg_acctrights = (caddr_t) &fd;
-msg.msg_acctrightslen = sizeof(fd);
+msg.msg_accrights = (caddr_t) &fd;
+msg.msg_accrightslen = sizeof(fd);
''',
- 'HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS',
- msg='Checking if we can use msg_acctrights for passing file descriptors',
+ 'HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS',
+ msg='Checking if we can use msg_accrights for passing file descriptors',
headers='sys/types.h stdlib.h stddef.h sys/socket.h sys/un.h')
if Options.options.with_winbind:
@@ -1854,7 +1854,7 @@ main() {
if conf.CONFIG_SET('HAVE_STATFS_F_FSID'):
default_shared_modules.extend(TO_LIST('vfs_fileid'))
- if (conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_ACCTRIGHTS')):
+ if (conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_CONTROL') or conf.CONFIG_SET('HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS')):
default_shared_modules.extend(TO_LIST('vfs_aio_fork'))
if Options.options.with_pthreadpool: