summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-07-02 18:37:39 +0000
committerJeremy Allison <jra@samba.org>2001-07-02 18:37:39 +0000
commited2fc9622284e928d328c2f91ddf869ca13e0a1e (patch)
treed557612f6557444edb013ac1e312103a7baeceed
parent56b2a0c1140e27eef879de0bb7deb570652d8334 (diff)
downloadsamba-ed2fc9622284e928d328c2f91ddf869ca13e0a1e.tar.gz
samba-ed2fc9622284e928d328c2f91ddf869ca13e0a1e.tar.bz2
samba-ed2fc9622284e928d328c2f91ddf869ca13e0a1e.zip
Fixed extra file_free calls - my fault :-(.
Jeremy. (This used to be commit 2f8b84bda040edc87a7af29c3a281cf335e392cb)
-rw-r--r--source3/printing/nt_printing.c18
-rw-r--r--source3/rpc_server/srv_srvsvc_nt.c2
2 files changed, 4 insertions, 16 deletions
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index 45080f8acc..5e28f3e5b6 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -645,18 +645,14 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in,
driverpath, cversion));
close_file(fsp, True);
- file_free(fsp);
close_cnum(conn, user->vuid);
pop_sec_ctx();
return cversion;
error_exit:
- if(fsp) {
- if(fsp->fd != -1)
- close_file(fsp, True);
- file_free(fsp);
- }
+ if(fsp)
+ close_file(fsp, True);
close_cnum(conn, user->vuid);
pop_sec_ctx();
@@ -1139,8 +1135,6 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
}
close_file(fsp, True);
- file_free(fsp);
-
/* Get file version info (if available) for new file */
pstrcpy(filepath, new_file);
@@ -1170,7 +1164,6 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
}
close_file(fsp, True);
- file_free(fsp);
if (use_version) {
/* Compare versions and choose the larger version number */
@@ -1198,11 +1191,8 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file,
}
error_exit:
- if(fsp) {
- file_free(fsp);
- if(fsp->fd != -1)
- close_file(fsp, True);
- }
+ if(fsp)
+ 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 44821d1432..b487eb1c82 100644
--- a/source3/rpc_server/srv_srvsvc_nt.c
+++ b/source3/rpc_server/srv_srvsvc_nt.c
@@ -1747,7 +1747,6 @@ uint32 _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
}
close_file(fsp, True);
- file_free(fsp);
close_cnum(conn, user.vuid);
return r_u->status;
@@ -1755,7 +1754,6 @@ uint32 _srv_net_file_set_secdesc(pipes_struct *p, SRV_Q_NET_FILE_SET_SECDESC *q_
if(fsp) {
close_file(fsp, True);
- file_free(fsp);
}
if (conn)