[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  0e9d4f6 build: fix the test and define for msg_accrights
       via  4106cf2 ctdb:build: fix building with external libtdb
      from  26ab17f s4-winbind: Use winbindd in the AD DC for fl2003dc and plugin_s4_dc

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0e9d4f68f94be4d187eb80429194267244861832
Author: Michael Adam <obnox at samba.org>
Date:   Sat Jun 14 00:55:02 2014 +0200

    build: fix the test and define for msg_accrights
    
    It must be "msg_accrights" not "msg_acctrights" ...
                                           ^
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Jun 16 18:18:04 CEST 2014 on sn-devel-104

commit 4106cf2eb969da179720067c86728441442cde59
Author: Michael Adam <obnox at samba.org>
Date:   Wed Jun 11 18:16:34 2014 +0200

    ctdb:build: fix building with external libtdb
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Jelmer Vernooij <jelmer at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/lib/tdb/libtdb.m4         |   14 +++++++-------
 source3/modules/vfs_aio_fork.c |    2 +-
 source3/wscript                |   10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/lib/tdb/libtdb.m4 b/ctdb/lib/tdb/libtdb.m4
index 6503bf1..86efc7d 100644
--- a/ctdb/lib/tdb/libtdb.m4
+++ b/ctdb/lib/tdb/libtdb.m4
@@ -10,13 +10,13 @@ AC_SUBST(TDB_CFLAGS)
 
 if test x"$INCLUDED_TDB" != x"yes" ; then
     AC_CHECK_HEADERS(tdb.h)
-    AC_CHECK_LIB(tdb, tdb_transaction_write_lock_mark, [ TDB_LIBS="-ltdb" ])
-    if test x"$ac_cv_header_tdb_h" = x"no" -o x"$ac_cv_lib_tdb_tdb_transaction_write_lock_mark" = x"no" ; then
-        INCLUDED_TDB=yes
-        TDB_CFLAGS=""
-    else
-        INCLUDED_TDB=no
-    fi
+    AC_CHECK_LIB(tdb, tdb_transaction_write_lock_mark,
+       [ TDB_LIBS="-ltdb"
+         TDB_CFLAGS=""
+         INCLUDED_TDB=no ],
+       [ TDB_LIBS=""
+         TDB_CFLAGS=""
+         INCLUDED_TDB=yes])
 fi
 
 AC_MSG_CHECKING(whether to use included tdb)
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:


-- 
Samba Shared Repository