summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2007-12-22 02:13:02 +0100
committerMichael Adam <obnox@samba.org>2007-12-22 02:13:02 +0100
commita000fa4ee5491ae32c60881b28b3536e88e82e27 (patch)
tree34b267d4e6dc980263aa65001385c06d99329546
parente47520f2221ea34a2264a3cc03fe1c5fcc5bf5c5 (diff)
downloadsamba-a000fa4ee5491ae32c60881b28b3536e88e82e27.tar.gz
samba-a000fa4ee5491ae32c60881b28b3536e88e82e27.tar.bz2
samba-a000fa4ee5491ae32c60881b28b3536e88e82e27.zip
Remove redundant connection_struct from check_magic() parameter list.
Michael (This used to be commit cebaa483e62910ac3f87cd135b2aff18dc880416)
-rw-r--r--source3/smbd/close.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index ff96c99712..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;
@@ -393,7 +394,7 @@ static NTSTATUS close_normal_file(files_struct *fsp, enum file_close_type close_
/* check for magic scripts */
if (close_type == NORMAL_CLOSE) {
- check_magic(fsp,conn);
+ check_magic(fsp);
}
/*