[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  480a031 smb2_constants: add SMB2_HDR_CREDIT_CHARGE
       via  7e7f085 s3:include: add CAP_LWIO and CAP_DYNAMIC_REAUTH defines
       via  3b9feed s3-build: move libsmb/clisigning.c to LIBSMB_SRC
      from  b58e7bb s3:smb2 fix Bug 8428 - wrong reply to DHnC (durable handle reconnect)

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


- Log -----------------------------------------------------------------
commit 480a031c5b9a2ffe1e03e3fcb197e526e6d69e72
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 30 11:48:16 2011 +0200

    smb2_constants: add SMB2_HDR_CREDIT_CHARGE
    
    SMB2_HDR_EPOCH was never used and SMB 2.10 uses it as
    SMB2_HDR_CREDIT_CHARGE.
    
    We keep SMB2_HDR_EPOCH as alias for now, until all callers
    are fixed.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Aug 30 23:49:56 CEST 2011 on sn-devel-104

commit 7e7f085419bd56ba7d8c7901188180e86840789b
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Aug 29 20:39:55 2011 +0200

    s3:include: add CAP_LWIO and CAP_DYNAMIC_REAUTH defines
    
    metze

commit 3b9feedd48076cdebf6da3e74925a8e650853c04
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Aug 30 16:58:09 2011 +0200

    s3-build: move libsmb/clisigning.c to LIBSMB_SRC
    
    It's only needed in the client library.
    
    metze

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

Summary of changes:
 libcli/smb/smb2_constants.h |    3 ++-
 source3/Makefile.in         |    4 ++--
 source3/include/smb.h       |    2 ++
 source3/wscript_build       |    5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 7ab496d..0e2c267 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -25,7 +25,8 @@
 /* offsets into header elements for a sync SMB2 request */
 #define SMB2_HDR_PROTOCOL_ID    0x00
 #define SMB2_HDR_LENGTH		0x04
-#define SMB2_HDR_EPOCH		0x06
+#define SMB2_HDR_CREDIT_CHARGE	0x06
+#define SMB2_HDR_EPOCH		SMB2_HDR_CREDIT_CHARGE /* TODO: remove this */
 #define SMB2_HDR_STATUS		0x08
 #define SMB2_HDR_OPCODE		0x0c
 #define SMB2_HDR_CREDIT		0x0e
diff --git a/source3/Makefile.in b/source3/Makefile.in
index c633510..9236750 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -459,7 +459,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) $(LIBTSOCKET_OBJ) \
 	  lib/substitute.o lib/substitute_generic.o ../lib/util/substitute.o lib/dbwrap/dbwrap_util.o \
 	  lib/ms_fnmatch.o ../lib/util/ms_fnmatch.o lib/errmap_unix.o ../libcli/util/errmap_unix.o \
 	  lib/tallocmsg.o lib/dmallocmsg.o \
-	  libsmb/clisigning.o libsmb/smb_signing.o \
+	  libsmb/smb_signing.o \
 	  ../lib/util/charset/iconv.o intl/lang_tdb.o \
 	  lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \
 	  lib/sessionid_tdb.o \
@@ -594,7 +594,7 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
 	     libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \
 	     libsmb/clioplock.o libsmb/clirap2.o \
 	     libsmb/smb_seal.o libsmb/async_smb.o \
-	     libsmb/read_smb.o \
+	     libsmb/read_smb.o libsmb/clisigning.o \
 	     libsmb/smb2cli_base.o \
 	     libsmb/smb2cli_negprot.o \
 	     libsmb/smb2cli_session.o \
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 207fc9e..c88b3fd 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1234,7 +1234,9 @@ http://msdn.microsoft.com/en-us/library/cc246334(PROT.13).aspx
 #define CAP_W2K_SMBS         0x2000
 #define CAP_LARGE_READX      0x4000
 #define CAP_LARGE_WRITEX     0x8000
+#define CAP_LWIO             0x10000
 #define CAP_UNIX             0x800000 /* Capabilities for UNIX extensions. Created by HP. */
+#define CAP_DYNAMIC_REAUTH    0x20000000
 #define CAP_EXTENDED_SECURITY 0x80000000
 
 /* printing types */
diff --git a/source3/wscript_build b/source3/wscript_build
index cdf1958..d04f519 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -76,7 +76,7 @@ LIB_SRC = '''
           lib/substitute.c lib/substitute_generic.c
           lib/ms_fnmatch.c
           lib/tallocmsg.c lib/dmallocmsg.c
-          libsmb/clisigning.c libsmb/smb_signing.c
+          libsmb/smb_signing.c
           intl/lang_tdb.c
           lib/conn_tdb.c lib/gencache.c
           lib/sessionid_tdb.c
@@ -136,7 +136,8 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
              libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
              libsmb/clioplock.c libsmb/clirap2.c
-             libsmb/smb_seal.c libsmb/async_smb.c  libsmb/read_smb.c
+             libsmb/smb_seal.c libsmb/async_smb.c
+             libsmb/read_smb.c libsmb/clisigning.c
              libsmb/smb2cli_base.c
              libsmb/smb2cli_negprot.c
              libsmb/smb2cli_session.c


-- 
Samba Shared Repository