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/Makefile.in | |
| 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/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 7a471dde4e..31d170d34d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -486,7 +486,7 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ ../libcli/security/security_token.o ../libcli/security/util_sid.o \ ../libcli/smb/util.o -LIB_DUMMY_OBJ = lib/dummysmbd.o lib/dummyparam.o lib/dummyroot.o +LIB_DUMMY_OBJ = lib/smbd_shim.o lib/dummyparam.o LIB_NONSMBD_OBJ = $(LIB_OBJ) $(LIB_DUMMY_OBJ) READLINE_OBJ = ../libcli/smbreadline/smbreadline.o @@ -907,6 +907,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \ lib/sysquotas.o lib/sysquotas_linux.o \ lib/sysquotas_xfs.o lib/sysquotas_4A.o \ lib/sysquotas_nfs.o \ + lib/smbd_shim.o \ smbd/fake_file.o \ smbd/quotas.o smbd/ntquotas.o $(AFS_OBJ) smbd/msdfs.o \ $(AFS_SETTOKEN_OBJ) smbd/aio.o smbd/statvfs.o \ |