diff options
| author | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
|---|---|---|
| committer | James Peach <jpeach@samba.org> | 2007-12-22 14:01:44 -0800 |
| commit | bf2269a04e5af056037c392fb7f29014b62d1bb2 (patch) | |
| tree | 38a2c68c2835bb65725003dd479a3a6fdbee1a51 /source3/smbd/close.c | |
| parent | 1176e04c76e28d9ee9ab355c5e9edcd1b627ac03 (diff) | |
| parent | a000fa4ee5491ae32c60881b28b3536e88e82e27 (diff) | |
| download | samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.gz samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.tar.bz2 samba-bf2269a04e5af056037c392fb7f29014b62d1bb2.zip | |
Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test
(This used to be commit 30cb2d215f1a4a440d5ecaab3f898daa714eee2b)
Diffstat (limited to 'source3/smbd/close.c')
| -rw-r--r-- | source3/smbd/close.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c index eb610f7d1a..5d30e467d0 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -27,7 +27,7 @@ extern struct current_user current_user; Run a file if it is a magic script. ****************************************************************************/ -static void check_magic(files_struct *fsp,connection_struct *conn) +static void check_magic(struct files_struct *fsp) { int ret; const char *magic_output = NULL; @@ -35,6 +35,7 @@ static void check_magic(files_struct *fsp,connection_struct *conn) int tmp_fd, outfd; TALLOC_CTX *ctx = NULL; const char *p; + struct connection_struct *conn = fsp->conn; if (!*lp_magicscript(SNUM(conn))) { return; @@ -389,11 +390,11 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_ locking_close_file(smbd_messaging_context(), fsp); - status = fd_close(conn, fsp); + status = fd_close(fsp); /* check for magic scripts */ if (close_type == NORMAL_CLOSE) { - check_magic(fsp,conn); + check_magic(fsp); } /* |