[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-211-g2090e75

[Andrew Tridgell]

The branch, v4-0-test has been updated
       via  2090e75e0c28f8d2aada305059bdb455f42ed0d5 (commit)
       via  a626a9c69cb2c07c8de69dcfe45361f86d6de58d (commit)
       via  40c93ffbe9eb09a5b3dc02ba56d28bf50df8ed82 (commit)
       via  e891157b4ec7b2f845fb20c4106d80bf169f2072 (commit)
       via  9e60164cae42b5dd95720e48301a2ac57e95482a (commit)
       via  2ebd7b80998775168959d511fbc987f8b5b7bd34 (commit)
       via  dfe4b5009885c4eeca24569f35b9fc85bfe6346b (commit)
      from  9013748273378f88bfc66d3583814f0fee67c40f (commit)

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


- Log -----------------------------------------------------------------
commit 2090e75e0c28f8d2aada305059bdb455f42ed0d5
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Apr 17 09:37:29 2008 +0200

    make smb2 read and write size configurable

commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d
Merge: 40c93ffbe9eb09a5b3dc02ba56d28bf50df8ed82 9013748273378f88bfc66d3583814f0fee67c40f
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Apr 17 09:36:09 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
    
    Conflicts:
    
    	source/ntvfs/ntvfs_generic.c

commit 40c93ffbe9eb09a5b3dc02ba56d28bf50df8ed82
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Apr 16 17:11:21 2008 +0200

    fixed popt handling on 64bit boxes in gentest

commit e891157b4ec7b2f845fb20c4106d80bf169f2072
Merge: 9e60164cae42b5dd95720e48301a2ac57e95482a d2fe61a13a8368ceae30c6e7320c8d3d62fbc485
Author: Andrew Tridgell <tridge at samba.org>
Date:   Tue Apr 15 09:54:41 2008 +0200

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

commit 9e60164cae42b5dd95720e48301a2ac57e95482a
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 14 19:09:57 2008 +0200

    make the SMB2 negotiated read and write size settable in smb.conf
    
    parametic options:
    
      smb2:max read size = NNN
      smb2:max write size = NNN
    
    The defaults are 65536, which is what Vista sets, and what we
    previously set

commit 2ebd7b80998775168959d511fbc987f8b5b7bd34
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 14 18:59:40 2008 +0200

    fixed a valgrind error in id mapping
    
    the status field is sent on both call and reply, but was only being
    initialised on reply

commit dfe4b5009885c4eeca24569f35b9fc85bfe6346b
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Apr 14 18:44:43 2008 +0200

    fixed an unitialised write warning in valgrind
    
    the 'reserved' field was not being initialised before being pushed to
    the wire

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

Summary of changes:
 source/ntvfs/posix/pvfs_acl.c    |    2 +-
 source/setup/provision           |    2 ++
 source/smb_server/smb2/negprot.c |    9 ++++++---
 source/torture/gentest.c         |   14 +++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/ntvfs/posix/pvfs_acl.c b/source/ntvfs/posix/pvfs_acl.c
index 2393a2e..f1e469f 100644
--- a/source/ntvfs/posix/pvfs_acl.c
+++ b/source/ntvfs/posix/pvfs_acl.c
@@ -135,7 +135,7 @@ static NTSTATUS pvfs_default_acl(struct pvfs_state *pvfs,
 	}
 	sd = *psd;
 
-	ids = talloc_array(sd, struct id_mapping, 2);
+	ids = talloc_zero_array(sd, struct id_mapping, 2);
 	NT_STATUS_HAVE_NO_MEMORY(ids);
 
 	ids[0].unixid = talloc(ids, struct unixid);
diff --git a/source/setup/provision b/source/setup/provision
index 259bd81..b748dab 100755
--- a/source/setup/provision
+++ b/source/setup/provision
@@ -35,6 +35,8 @@ from samba.provision import (provision,
                              FILL_FULL, FILL_NT4SYNC,
                              FILL_DRS)
 
+# how do we make this case insensitive??
+
 parser = optparse.OptionParser("provision [options]")
 sambaopts = options.SambaOptions(parser)
 parser.add_option_group(sambaopts)
diff --git a/source/smb_server/smb2/negprot.c b/source/smb_server/smb2/negprot.c
index e7352f7..4479ae2 100644
--- a/source/smb_server/smb2/negprot.c
+++ b/source/smb_server/smb2/negprot.c
@@ -114,9 +114,12 @@ static NTSTATUS smb2srv_negprot_backend(struct smb2srv_request *req, struct smb2
 	io->out.security_mode      = 0; /* no signing yet */
 	io->out.dialect_revision   = SMB2_DIALECT_REVISION;
 	io->out.capabilities       = 0;
-	io->out.max_transact_size  = 0x10000;
-	io->out.max_read_size      = 0x10000;
-	io->out.max_write_size     = 0x10000;
+	io->out.max_transact_size  = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+						   "smb2", "max transaction size", 0x10000);
+	io->out.max_read_size      = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+						   "smb2", "max read size", 0x10000);
+	io->out.max_write_size     = lp_parm_ulong(req->smb_conn->lp_ctx, NULL, 
+						   "smb2", "max write size", 0x10000);
 	io->out.system_time	   = timeval_to_nttime(&current_time);
 	io->out.server_start_time  = timeval_to_nttime(&boot_time);
 	io->out.reserved2          = 0;
diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index d5fc855..6d872c6 100644
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -36,18 +36,18 @@
 
 /* global options */
 static struct gentest_options {
-	bool showall;
-	bool analyze;
-	bool analyze_always;
-	bool analyze_continuous;
+	int showall;
+	int analyze;
+	int analyze_always;
+	int analyze_continuous;
 	uint_t max_open_handles;
 	uint_t seed;
 	uint_t numops;
-	bool use_oplocks;
+	int use_oplocks;
 	char **ignore_patterns;
 	const char *seeds_file;
-	bool use_preset_seeds;
-	bool fast_reconnect;
+	int use_preset_seeds;
+	int fast_reconnect;
 } options;
 
 /* mapping between open handles on the server and local handles */


-- 
Samba Shared Repository