diff options
| author | Volker Lendecke <vl@samba.org> | 2008-10-09 16:27:49 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-10-13 19:32:38 +0200 |
| commit | c530009401f111bc62008a2a75cdad5b9d5ee7d1 (patch) | |
| tree | 6390031d8b5372f7329bdecacf8f985ac0559b62 /source3/printing | |
| parent | c3fedcddd5e79c60f5fcc0219752c27277a4d9f7 (diff) | |
| download | samba-c530009401f111bc62008a2a75cdad5b9d5ee7d1.tar.gz samba-c530009401f111bc62008a2a75cdad5b9d5ee7d1.tar.xz samba-c530009401f111bc62008a2a75cdad5b9d5ee7d1.zip | |
Pass struct smb_request to file_free
on the way to get rid of chain_fsp
Diffstat (limited to 'source3/printing')
| -rw-r--r-- | source3/printing/nt_printing.c | 10 | ||||
| -rw-r--r-- | source3/printing/printfsp.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 13a6403b1c0..85f42feb91a 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -1376,7 +1376,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time)); } } - close_file(fsp, NORMAL_CLOSE); + close_file(NULL, fsp, NORMAL_CLOSE); fsp = NULL; /* Get file version info (if available) for new file */ @@ -1417,7 +1417,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time)); } } - close_file(fsp, NORMAL_CLOSE); + close_file(NULL, fsp, NORMAL_CLOSE); fsp = NULL; if (use_version && (new_major != old_major || new_minor != old_minor)) { @@ -1447,7 +1447,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr error_exit: if(fsp) - close_file(fsp, NORMAL_CLOSE); + close_file(NULL, fsp, NORMAL_CLOSE); return -1; } @@ -1583,7 +1583,7 @@ static uint32 get_correct_cversion(const char *architecture, fstring driverpath_ DEBUG(10,("get_correct_cversion: Driver file [%s] cversion = %d\n", driverpath, cversion)); - close_file(fsp, NORMAL_CLOSE); + close_file(NULL, fsp, NORMAL_CLOSE); close_cnum(conn, user->vuid); unbecome_user(); *perr = WERR_OK; @@ -1593,7 +1593,7 @@ static uint32 get_correct_cversion(const char *architecture, fstring driverpath_ error_exit: if(fsp) - close_file(fsp, NORMAL_CLOSE); + close_file(NULL, fsp, NORMAL_CLOSE); close_cnum(conn, user->vuid); unbecome_user(); diff --git a/source3/printing/printfsp.c b/source3/printing/printfsp.c index 02122e8a6b7..a247cd84276 100644 --- a/source3/printing/printfsp.c +++ b/source3/printing/printfsp.c @@ -53,7 +53,7 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn, jobid = print_job_start(conn->server_info, SNUM(conn), name, NULL); if (jobid == -1) { status = map_nt_error_from_unix(errno); - file_free(fsp); + file_free(req, fsp); return status; } @@ -62,7 +62,7 @@ NTSTATUS print_fsp_open(struct smb_request *req, connection_struct *conn, if (fsp->rap_print_jobid == 0) { /* We need to delete the entry in the tdb. */ pjob_delete(lp_const_servicename(SNUM(conn)), jobid); - file_free(fsp); + file_free(req, fsp); return NT_STATUS_ACCESS_DENIED; /* No errno around here */ } |