[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  568a54f... s3-waf: fix the build after smbd/change_trust_pw.c removal.
       via  f7a3bd4... tdb: fix the build on mac os x 10.6.4.
      from  eb634e8... s3-libnet_join: small IDL enhancement.

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


- Log -----------------------------------------------------------------
commit 568a54f324c4564438edd6369ae4fdf17b667e6e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jul 1 23:15:13 2010 +0200

    s3-waf: fix the build after smbd/change_trust_pw.c removal.
    
    Guenther

commit f7a3bd4fa42eba56675c46d0a2baf0dccded8018
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jun 3 19:05:43 2010 +0200

    tdb: fix the build on mac os x 10.6.4.
    
    Guenther

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

Summary of changes:
 lib/tdb/common/transaction.c |    4 ++++
 source3/wscript_build        |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/common/transaction.c b/lib/tdb/common/transaction.c
index 304a03f..ebf1cec 100644
--- a/lib/tdb/common/transaction.c
+++ b/lib/tdb/common/transaction.c
@@ -548,7 +548,11 @@ static int transaction_sync(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t
 		return 0;
 	}
 
+#ifdef HAVE_FDATASYNC
 	if (fdatasync(tdb->fd) != 0) {
+#else
+	if (fsync(tdb->fd) != 0) {
+#endif
 		tdb->ecode = TDB_ERR_IO;
 		TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction: fsync failed\n"));
 		return -1;
diff --git a/source3/wscript_build b/source3/wscript_build
index d91d2be..cc7ebd3 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -686,7 +686,7 @@ SMBD_SRC_SRV = '''smbd/server_reload.c smbd/files.c smbd/connection.c
                smbd/process.c smbd/service.c smbd/error.c
                printing/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
                lib/sysquotas_xfs.c lib/sysquotas_4A.c
-               smbd/change_trust_pw.c smbd/fake_file.c
+               smbd/fake_file.c
                smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
                ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
                smbd/dmapi.c smbd/signing.c


-- 
Samba Shared Repository