summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-17 13:05:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-17 13:05:25 +0200
commitdd0da89e841e5df0c1fe27122df0c1644278c65e (patch)
tree75de1500ca458d977c36831491a9495738da9c2c /source4/ntvfs/posix
parent0197b8e0ff8dc26eeb71dccf61d8937c63bacff5 (diff)
parent4d8f3f190215edcdbeb1725cccdc962dc68cc1a0 (diff)
downloadsamba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.gz
samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.tar.bz2
samba-dd0da89e841e5df0c1fe27122df0c1644278c65e.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ece878c1f9251b83598508e23ce0015b4db72f0a)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/pvfs_acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 2393a2e7a3..f1e469f790 100644
--- 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);