[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  19e8002 s3/torture: adjust dependency to fix build when no winbind was build before
       via  b865cdd s3: make log message of FSCTL_IS_VOLUME_DIRTY more clear
       via  a93f56a test: fix compile warning on test summary
      from  2cc38ac mkversion: Remove quotes around SAMBA_VERSION_VENDOR_PATCH string

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


- Log -----------------------------------------------------------------
commit 19e80027b4fe946d2e96d770b92415c8bdc185c5
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Jul 12 12:41:55 2012 +0200

    s3/torture: adjust dependency to fix build when no winbind was build before
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Thu Jul 12 14:44:14 CEST 2012 on sn-devel-104

commit b865cddee7690bc61d76348b295edded96ae4d58
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Jul 10 12:26:50 2012 +0200

    s3: make log message of FSCTL_IS_VOLUME_DIRTY more clear

commit a93f56a0699e32243efd8829db159ae947808530
Author: Björn Jacke <bj at sernet.de>
Date:   Fri Jul 6 07:01:09 2012 +0200

    test: fix compile warning on test summary

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

Summary of changes:
 source3/Makefile.in           |    2 +-
 source3/modules/vfs_default.c |    2 +-
 tests/summary.c               |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3b59a28..39efd99 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2007,7 +2007,7 @@ bin/nmblookup: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LI
 	@$(CC) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
 
-bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT)
+bin/smbtorture: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) $(IDMAP_UTIL_OBJ)
 	@echo Linking $@
 	@$(CC) -o $@ $(SMBTORTURE_OBJ) $(IDMAP_UTIL_OBJ) $(LDFLAGS) $(DYNEXP) \
 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index eb3e343..8485495 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1084,7 +1084,7 @@ static NTSTATUS vfswrap_fsctl(struct vfs_handle_struct *handle,
 	case FSCTL_IS_VOLUME_DIRTY:
 	{
 		DEBUG(10,("FSCTL_IS_VOLUME_DIRTY: called on %s "
-			  "(but not implemented)\n", fsp_fnum_dbg(fsp)));
+			  "(but remotely not supported)\n", fsp_fnum_dbg(fsp)));
 		/*
 		 * http://msdn.microsoft.com/en-us/library/cc232128%28PROT.10%29.aspx
 		 * says we have to respond with NT_STATUS_INVALID_PARAMETER
diff --git a/tests/summary.c b/tests/summary.c
index bd0c162..27f7d4d 100644
--- a/tests/summary.c
+++ b/tests/summary.c
@@ -2,7 +2,7 @@
 
 void exit(int);
 
-main()
+int main()
 {
 #if !defined(HAVE_FCNTL_LOCK)
 	printf("ERROR: No locking available. Running Samba would be unsafe\n");


-- 
Samba Shared Repository