sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Fixed extra file_free calls - my fault :-(.

Browse Source 
Jeremy.
(This used to be commit 2f8b84bda0)
This commit is contained in:
Jeremy Allison 2001-07-02 18:37:39 +00:00
parent 56b2a0c114
commit ed2fc96222
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/printing/nt_printing.c
View File

@ -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;
}

2
source3/rpc_server/srv_srvsvc_nt.c
View File

@ -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)