The branch, master has been updated
via 9ede19f s3-build: make it a little easier to build smbtorture4.
via 3800bae s3-vfs: try to fix build of aio_fork module.
from d546ade Change convert_string_internal() and convert_string_error()
to bool return.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 9ede19fdccaf09303012208129a093197403ef2c
Author: Günther Deschner <[email protected]>
Date: Wed Mar 30 22:24:42 2011 +0200
s3-build: make it a little easier to build smbtorture4.
Only configure with --enable-socket-wrapper --enable-nss-wrapper
--enable-uid-wrapper, not --enable-developer which turns on at least one
-Werror
switch.
Guenther
Autobuild-User: Günther Deschner <[email protected]>
Autobuild-Date: Wed Mar 30 23:12:42 CEST 2011 on sn-devel-104
commit 3800bae260ed3998317ce5e492a8f0a42fb2fd5f
Author: Günther Deschner <[email protected]>
Date: Wed Mar 30 22:24:18 2011 +0200
s3-vfs: try to fix build of aio_fork module.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile-smbtorture4 | 2 +-
source3/modules/vfs_aio_fork.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 939d4d4..4a1bed7 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
samba4-configure:
@(cd .. && \
CFLAGS='' $(WAF) reconfigure || \
- CFLAGS='' $(WAF) configure --enable-developer
--nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure )
+ CFLAGS='' $(WAF) configure --enable-socket-wrapper
--enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES)
--enable-auto-reconfigure )
.PHONY: samba4-configure
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index fc8ffef..881bc51 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -20,8 +20,9 @@
*/
#include "includes.h"
-#include "smbd/smbd.h"
+#include "system/filesys.h"
#include "system/shmem.h"
+#include "smbd/smbd.h"
struct mmap_area {
size_t size;
--
Samba Shared Repository
