git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3:smbd: fix max_buffer handling of initial notify requests
[samba.git]
/
source3
/
smbd
/
nttrans.c
diff --git
a/source3/smbd/nttrans.c
b/source3/smbd/nttrans.c
index 3c9b0ebb3f5d5636488d894136e3533250a969d2..8bb121a13515fe6c43a36cf9550485d642200e94 100644
(file)
--- a/
source3/smbd/nttrans.c
+++ b/
source3/smbd/nttrans.c
@@
-543,6
+543,7
@@
void reply_ntcreate_and_X(struct smb_request *req)
fname,
ucf_flags,
NULL,
fname,
ucf_flags,
NULL,
+ NULL,
&smb_fname);
TALLOC_FREE(case_state);
&smb_fname);
TALLOC_FREE(case_state);
@@
-1115,6
+1116,7
@@
static void call_nt_transact_create(connection_struct *conn,
fname,
ucf_flags,
NULL,
fname,
ucf_flags,
NULL,
+ NULL,
&smb_fname);
TALLOC_FREE(case_state);
&smb_fname);
TALLOC_FREE(case_state);
@@
-1636,6
+1638,7
@@
void reply_ntrename(struct smb_request *req)
oldname,
ucf_flags_src,
NULL,
oldname,
ucf_flags_src,
NULL,
+ NULL,
&smb_fname_old);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status,
&smb_fname_old);
if (!NT_STATUS_IS_OK(status)) {
if (NT_STATUS_EQUAL(status,
@@
-1652,6
+1655,7
@@
void reply_ntrename(struct smb_request *req)
status = filename_convert(ctx, conn,
newname,
ucf_flags_dst,
status = filename_convert(ctx, conn,
newname,
ucf_flags_dst,
+ NULL,
&dest_has_wcard,
&smb_fname_new);
if (!NT_STATUS_IS_OK(status)) {
&dest_has_wcard,
&smb_fname_new);
if (!NT_STATUS_IS_OK(status)) {
@@
-1802,8
+1806,10
@@
static void call_nt_transact_notify_change(connection_struct *conn,
if (fsp->notify == NULL) {
if (fsp->notify == NULL) {
- status = change_notify_create(fsp, filter, recursive);
-
+ status = change_notify_create(fsp,
+ max_param_count,
+ filter,
+ recursive);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("change_notify_create returned %s\n",
nt_errstr(status)));
if (!NT_STATUS_IS_OK(status)) {
DEBUG(10, ("change_notify_create returned %s\n",
nt_errstr(status)));
@@
-2468,10
+2474,11
@@
static enum ndr_err_code extract_sids_from_buf(TALLOC_CTX *mem_ctx,
*num = i;
for (iter = sid_list, i = 0; iter; iter = iter->next, i++) {
*num = i;
for (iter = sid_list, i = 0; iter; iter = iter->next, i++) {
+ struct dom_sid_buf buf;
(*sids)[i] = iter->sid;
DBG_DEBUG("quota SID[%u] %s\n",
(unsigned int)i,
(*sids)[i] = iter->sid;
DBG_DEBUG("quota SID[%u] %s\n",
(unsigned int)i,
-
sid_string_dbg(&iter->sid
));
+
dom_sid_str_buf(&iter->sid, &buf
));
}
}
err = NDR_ERR_SUCCESS;
}
}
err = NDR_ERR_SUCCESS;