summaryrefslogtreecommitdiffstats
path: root/source4/smb_server
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-05-26 12:19:09 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-05-26 12:19:09 +0200
commit40a90e6a5581f74b2e8caf67d934a08e8a9befc9 (patch)
treea34823fd0dec12eb87976e20e4dbdb3f3e4e1069 /source4/smb_server
parent58b1ab92a117cfcb311bdcb41fe563077ad39500 (diff)
parent98e72f574a9ce2a676bcb010e4e6ee2df39af4b6 (diff)
downloadsamba-40a90e6a5581f74b2e8caf67d934a08e8a9befc9.tar.gz
samba-40a90e6a5581f74b2e8caf67d934a08e8a9befc9.tar.xz
samba-40a90e6a5581f74b2e8caf67d934a08e8a9befc9.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-pyirpc
(This used to be commit e1af9708c9b40edfa21862028672882797218174)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/reply.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index 40cad91062b..d28f4b6072e 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -2193,6 +2193,11 @@ void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req)
io->ntcreatex.in.ea_list = NULL;
io->ntcreatex.in.sec_desc = NULL;
+ /* we use a couple of bits of the create options internally */
+ if (io->ntcreatex.in.create_options & NTCREATEX_OPTIONS_PRIVATE_MASK) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
/* we need a neater way to handle this alignment */
if ((req->flags2 & FLAGS2_UNICODE_STRINGS) &&
ucs2_align(req->in.buffer, req->in.data, STR_TERMINATE|STR_UNICODE)) {