[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  436cda0 s3:smb2_server: make use of SMB2_WRITEFLAG_WRITE_THROUGH
       via  dd3c1b7 smb2_constants: add SMB2_WRITEFLAG_WRITE_THROUGH define
       via  b9cc4dd s4:librpc: rpc_common.h was move to dcerpc-binding
       via  9d5711e s4:auth/gensec: gensec.h was moved to gensec_runtime
      from  e68c4f4 waf: install pam modules in PAMMODULESDIR.

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


- Log -----------------------------------------------------------------
commit 436cda0cbd4682aad78edae02e663420b95c4cda
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 6 13:38:32 2011 +0200

    s3:smb2_server: make use of SMB2_WRITEFLAG_WRITE_THROUGH
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Sep  6 16:59:50 CEST 2011 on sn-devel-104

commit dd3c1b740cfd69fc4bac11afec2524cf7a55681f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 6 13:36:03 2011 +0200

    smb2_constants: add SMB2_WRITEFLAG_WRITE_THROUGH define
    
    metze

commit b9cc4dd0885e5f4c8cf1b9c05e82a65345380987
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 6 15:21:12 2011 +0200

    s4:librpc: rpc_common.h was move to dcerpc-binding
    
    metze

commit 9d5711e3dec33e41451d606d610f987d6589c967
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Sep 6 15:20:25 2011 +0200

    s4:auth/gensec: gensec.h was moved to gensec_runtime
    
    metze

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

Summary of changes:
 libcli/smb/smb2_constants.h       |    2 ++
 source3/smbd/smb2_write.c         |    2 +-
 source4/auth/gensec/wscript_build |    2 +-
 source4/librpc/wscript_build      |    2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index 0e2c267..27d7495 100644
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -187,4 +187,6 @@
 
 #define SMB2_CLOSE_FLAGS_FULL_INFORMATION (0x01)
 
+#define SMB2_WRITEFLAG_WRITE_THROUGH	0x00000001
+
 #endif
diff --git a/source3/smbd/smb2_write.c b/source3/smbd/smb2_write.c
index 057abcc..a6ad42b 100644
--- a/source3/smbd/smb2_write.c
+++ b/source3/smbd/smb2_write.c
@@ -245,7 +245,7 @@ static struct tevent_req *smbd_smb2_write_send(TALLOC_CTX *mem_ctx,
 		return NULL;
 	}
 	state->smb2req = smb2req;
-	if (in_flags & 0x00000001) {
+	if (in_flags & SMB2_WRITEFLAG_WRITE_THROUGH) {
 		state->write_through = true;
 	}
 	state->in_length = in_data.length;
diff --git a/source4/auth/gensec/wscript_build b/source4/auth/gensec/wscript_build
index ec4a83c..c5c0c34 100644
--- a/source4/auth/gensec/wscript_build
+++ b/source4/auth/gensec/wscript_build
@@ -4,8 +4,8 @@ bld.SAMBA_LIBRARY('gensec',
 	source='gensec_start.c socket.c gensec_tstream.c',
 	pc_files='gensec.pc',
 	autoproto='gensec_proto.h',
-	public_headers='../../../auth/gensec/gensec.h',
 	public_deps='tevent-util samba-util errors LIBPACKET auth_system_session gensec_runtime',
+	public_headers='',
 	deps='com_err',
 	vnum='0.0.1'
 	)
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 677dd30..5a76133 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -144,7 +144,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 	public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
 	../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h
 	../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h
-	../../librpc/gen_ndr/ndr_epmapper_c.h ../../librpc/rpc/rpc_common.h''',
+	../../librpc/gen_ndr/ndr_epmapper_c.h''',
 	# It's very important to keep this form of construction
 	# it force the sambawaf extension to put everything that match the first element
 	# (*gen_ndr*) into the dir named by the second element (gen_ndr).


-- 
Samba Shared Repository