[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  26f6f3b ѕ3/configure: move out generic CPPFLAGS in the solaris case here
       via  ee0a341 ѕ3/configure: move out generic LDFLAGS in the solaris case here
       via  56d3232 s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path
      from  67acc4c s3: Handle EINTR from sys_poll correctly

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 26f6f3bb7f5c79f6a5c95218f37f4f01620b5234
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Apr 20 23:40:30 2011 +0200

    ѕ3/configure: move out generic CPPFLAGS in the solaris case here
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 862ff644ee564b2b3ed316da8c19df2f958aef66)

commit ee0a341c8963ed72ccd1799c10567e4f5d400016
Author: Björn Jacke <bj at sernet.de>
Date:   Wed Apr 20 23:32:12 2011 +0200

    ѕ3/configure: move out generic LDFLAGS in the solaris case here
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    (cherry picked from commit 9738f35f2cef0af11c3390162a9c2a3841d6073b)

commit 56d3232ec117d5791c88bc771432ad4f9bfa775f
Author: Björn Jacke <bj at sernet.de>
Date:   Thu Apr 21 00:11:21 2011 +0200

    s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User: Björn Jacke <bj at sernet.de>
    Autobuild-Date: Tue May  3 13:04:11 CEST 2011 on sn-devel-104
    (cherry picked from commit cd9a7c143c87fa0f1fda8a6c9b331b21ae6148a2)

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

Summary of changes:
 source3/configure.in |   11 +++++------
 source3/smbd/reply.c |    2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index f4df36d..05a4ae1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -518,6 +518,8 @@ case "$host_os" in
 	  			AC_MSG_RESULT([no large file support])
 				;;
 			5.*)
+			LDFLAGS="$LDFLAGS -lthread"
+			CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 			AC_MSG_RESULT([enabling large file support])
 			if test "$ac_cv_prog_gcc" = yes; then
 				${CC-cc} -v >conftest.c 2>&1
@@ -525,20 +527,17 @@ case "$host_os" in
 				rm -fr conftest.c
 				case "$ac_cv_gcc_compiler_version_number" in
 					*"gcc version 2.6"*|*"gcc version 2.7"*)
-						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT"
-						LDFLAGS="$LDFLAGS -lthread"
+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
 						AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 						;;
 					*)
-						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-						LDFLAGS="$LDFLAGS -lthread"
+						CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 						AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 						AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
 						;;
 				esac
 			else
-				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_REENTRANT -D_FILE_OFFSET_BITS=64"
-				LDFLAGS="$LDFLAGS -lthread"
+				CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 				AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
 				AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
 			fi
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index db40539..9c66dde 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -3213,7 +3213,7 @@ void reply_readbraw(struct smb_request *req)
 				"(%x << 32) used and we don't support "
 				"64 bit offsets.\n",
 			(unsigned int)IVAL(req->vwv+8, 0) ));
-			reply_readbraw_error();
+			reply_readbraw_error(sconn);
 			END_PROFILE(SMBreadbraw);
 			return;
 		}


-- 
Samba Shared Repository