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/oplock.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/oplock.c')
| -rw-r--r-- | source3/smbd/oplock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 56481e9700..284b0321aa 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -849,7 +849,7 @@ static void contend_level2_oplocks_begin_default(files_struct *fsp, TALLOC_FREE(lck); } -void contend_level2_oplocks_begin(files_struct *fsp, +void smbd_contend_level2_oplocks_begin(files_struct *fsp, enum level2_contention_type type) { if (koplocks && koplocks->ops->contend_level2_oplocks_begin) { @@ -860,7 +860,7 @@ void contend_level2_oplocks_begin(files_struct *fsp, contend_level2_oplocks_begin_default(fsp, type); } -void contend_level2_oplocks_end(files_struct *fsp, +void smbd_contend_level2_oplocks_end(files_struct *fsp, enum level2_contention_type type) { /* Only kernel oplocks implement this so far */ |