diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 13:18:37 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-06-21 15:54:51 +1000 |
| commit | b373d0e777df8770c24cfcc5cc80bf4808faa815 (patch) | |
| tree | aeb149d1bc9290a7ddfe0b9aba4cb1fe5314a59b /source3/smbd/blocking.c | |
| parent | e00b1fa2b032012e741d94f3fe0057d6ea53bf4c (diff) | |
| download | samba-b373d0e777df8770c24cfcc5cc80bf4808faa815.tar.gz samba-b373d0e777df8770c24cfcc5cc80bf4808faa815.tar.bz2 samba-b373d0e777df8770c24cfcc5cc80bf4808faa815.zip | |
s3-build: Provide a run-time shim to work around duplicate symbols
The become_root() and similar 'smbd' functions that are used widely in
Samba libraries had 'dummy' copies in dummysmbd.c and dummyroot.c.
These have been replaced by a runtime plugin mechanim, which ensures
that standlone binaries still do nothing, while in smbd the correct
function is used.
This avoids having these as duplicate symbols in the smbd binary,
which can cause unpredictable behaviour.
Andrew Bartlett
Signed-off-by: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/smbd/blocking.c')
| -rw-r--r-- | source3/smbd/blocking.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index fd77e3d15b..d9c1fb2d3b 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -574,9 +574,9 @@ static bool blocking_lock_record_process(struct blocking_lock_record *blr) Called when a file is closed. *****************************************************************************/ -void cancel_pending_lock_requests_by_fid(files_struct *fsp, - struct byte_range_lock *br_lck, - enum file_close_type close_type) +void smbd_cancel_pending_lock_requests_by_fid(files_struct *fsp, + struct byte_range_lock *br_lck, + enum file_close_type close_type) { struct smbd_server_connection *sconn = fsp->conn->sconn; struct blocking_lock_record *blr, *blr_cancelled, *next = NULL; |