git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3cf3d54
)
s3: Remove smbd_server_conn from msg_file_was_renamed
author
Volker Lendecke
<vl@samba.org>
Sun, 3 Oct 2010 15:34:43 +0000
(17:34 +0200)
committer
Volker Lendecke
<vl@samba.org>
Sun, 3 Oct 2010 16:17:09 +0000
(18:17 +0200)
source3/smbd/open.c
patch
|
blob
|
history
diff --git
a/source3/smbd/open.c
b/source3/smbd/open.c
index d7927b7502f9ad5ff8cf913c78ce340fcb67073b..d3953319fe9233ba5d4eee7d0b2f6a29a22928cf 100644
(file)
--- a/
source3/smbd/open.c
+++ b/
source3/smbd/open.c
@@
-2734,6
+2734,7
@@
void msg_file_was_renamed(struct messaging_context *msg,
struct server_id server_id,
DATA_BLOB *data)
{
struct server_id server_id,
DATA_BLOB *data)
{
+ struct smbd_server_connection *sconn;
files_struct *fsp;
char *frm = (char *)data->data;
struct file_id id;
files_struct *fsp;
char *frm = (char *)data->data;
struct file_id id;
@@
-2744,6
+2745,12
@@
void msg_file_was_renamed(struct messaging_context *msg,
size_t sp_len, bn_len;
NTSTATUS status;
size_t sp_len, bn_len;
NTSTATUS status;
+ sconn = msg_ctx_to_sconn(msg);
+ if (sconn == NULL) {
+ DEBUG(1, ("could not find sconn\n"));
+ return;
+ }
+
if (data->data == NULL
|| data->length < MSG_FILE_RENAMED_MIN_SIZE + 2) {
DEBUG(0, ("msg_file_was_renamed: Got invalid msg len %d\n",
if (data->data == NULL
|| data->length < MSG_FILE_RENAMED_MIN_SIZE + 2) {
DEBUG(0, ("msg_file_was_renamed: Got invalid msg len %d\n",
@@
-2775,7
+2782,7
@@
void msg_file_was_renamed(struct messaging_context *msg,
sharepath, smb_fname_str_dbg(smb_fname),
file_id_string_tos(&id)));
sharepath, smb_fname_str_dbg(smb_fname),
file_id_string_tos(&id)));
- for(fsp = file_find_di_first(s
mbd_server_
conn, id); fsp;
+ for(fsp = file_find_di_first(sconn, id); fsp;
fsp = file_find_di_next(fsp)) {
if (memcmp(fsp->conn->connectpath, sharepath, sp_len) == 0) {
fsp = file_find_di_next(fsp)) {
if (memcmp(fsp->conn->connectpath, sharepath, sp_len) == 0) {