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

Conflicts:

	source/ntvfs/ntvfs_generic.c
(This used to be commit a626a9c69cb2c07c8de69dcfe45361f86d6de58d)

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 2393a2e7a3c2d3bb19895c3dcf8c8b14d0cc0323..f1e469f7909fdb9b8b394cd36687fea606fa844f 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/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/source4/setup/provision b/source4/setup/provision
index 259bd814a4be20e07cdd2c48ac4fdb36b947ccbb..b748dab33998cd49dd66ec8579c598ac09bc9032 100755 (executable)
--- a/source4/setup/provision
+++ b/source4/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/source4/torture/gentest.c b/source4/torture/gentest.c
index d5fc855f175fbd32cc9fb4b10349351b59e8d012..6d872c687b8ec4ad04a12e353721046a3f31d1d1 100644 (file)
--- a/source4/torture/gentest.c
+++ b/source4/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 */