diff options
| -rw-r--r-- | source3/printing/nt_printing.c | 10 | ||||
| -rw-r--r-- | source3/rpc_server/srv_srvsvc_nt.c | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index 11d0cfbdd5..f302d357cd 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -644,7 +644,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in, DEBUG(10,("get_correct_cversion: Driver file [%s] cversion = %d\n", driverpath, cversion)); - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); close_cnum(conn, user->vuid); pop_sec_ctx(); @@ -654,7 +654,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in, error_exit: if(fsp) { if(fsp->fd != -1) - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); } @@ -1138,7 +1138,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", old_create_time)); } } - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); @@ -1169,7 +1169,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, DEBUGADD(6,("file_version_is_newer: mod time = %ld sec\n", new_create_time)); } } - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); if (use_version) { @@ -1201,7 +1201,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, if(fsp) { file_free(fsp); if(fsp->fd != -1) - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); } return -1; } diff --git a/source3/rpc_server/srv_srvsvc_nt.c b/source3/rpc_server/srv_srvsvc_nt.c index 4650512218..d071572804 100644 --- a/source3/rpc_server/srv_srvsvc_nt.c +++ b/source3/rpc_server/srv_srvsvc_nt.c @@ -1639,7 +1639,7 @@ uint32 _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC psd->dacl->revision = (uint16) NT4_ACL_REVISION; - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); close_cnum(conn, user.vuid); @@ -1648,7 +1648,7 @@ uint32 _srv_net_file_query_secdesc(pipes_struct *p, SRV_Q_NET_FILE_QUERY_SECDESC error_exit: if(fsp) { - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); } @@ -1726,7 +1726,7 @@ uint32 _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_ goto error_exit; } - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); close_cnum(conn, user.vuid); return r_u->status; @@ -1734,7 +1734,7 @@ uint32 _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_ error_exit: if(fsp) { - fsp->conn->vfs_ops.close(fsp, fsp->fd); + close_file(fsp, True); file_free(fsp); } |