diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 10 | ||||
| -rw-r--r-- | source3/configure.in | 1 | ||||
| -rw-r--r-- | source3/lib/system.c | 1 | ||||
| -rw-r--r-- | source3/lib/util_sec.c | 1 | ||||
| -rw-r--r-- | source3/smbd/sec_ctx.c | 1 | ||||
| -rw-r--r-- | source3/wscript | 1 | ||||
| -rwxr-xr-x | source3/wscript_build | 4 |
7 files changed, 14 insertions, 5 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index a048090cee..1bb987e04d 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -403,10 +403,12 @@ LIBREPLACE_OBJ = @LIBREPLACE_OBJS@ SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@ NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@ +UID_WRAPPER_OBJ = @UID_WRAPPER_OBJS@ LIBSAMBAUTIL_OBJ = \ $(LIBREPLACE_OBJ) \ $(SOCKET_WRAPPER_OBJ) \ + $(UID_WRAPPER_OBJ) \ $(NSS_WRAPPER_OBJ) UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \ @@ -1990,9 +1992,10 @@ bin/locktest@EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC @LIBWBCLIENT_STATIC@ $(LIBWBCLIENT_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(ZLIB_LIBS) -bin/nsstest@EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) +bin/nsstest@EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) $(LIBTALLOC) @echo Linking $@ - @$(CC) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) + @$(CC) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \ + $(LIBTALLOC_LIBS) bin/pdbtest@EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) $(LIBWBCLIENT) @echo Linking $@ @@ -2785,10 +2788,11 @@ bin/winbindd@EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ $(LIBTALLOC $(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) \ $(ZLIB_LIBS) -bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) +bin/vlp@EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) $(LIBTDB) $(LIBTALLOC) @echo "Linking $@" @$(CC) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \ $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \ + $(LIBTALLOC_LIBS) \ $(LIBTDB_LIBS) @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ) diff --git a/source3/configure.in b/source3/configure.in index 068728578e..7405cfddf7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -126,6 +126,7 @@ fi m4_include(../lib/socket_wrapper/config.m4) m4_include(../lib/nss_wrapper/config.m4) +m4_include(../lib/uid_wrapper/config.m4) m4_include(m4/swat.m4) diff --git a/source3/lib/system.c b/source3/lib/system.c index 2f7a55f48c..0aefd6d929 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -25,6 +25,7 @@ #include "system/capability.h" #include "system/passwd.h" #include "system/filesys.h" +#include "lib/uid_wrapper/uid_wrapper.h" #ifdef HAVE_SYS_PRCTL_H #include <sys/prctl.h> diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c index d7984ac999..0e2eee44af 100644 --- a/source3/lib/util_sec.c +++ b/source3/lib/util_sec.c @@ -19,6 +19,7 @@ #ifndef AUTOCONF_TEST #include "includes.h" +#include "lib/uid_wrapper/uid_wrapper.h" #else /* we are running this code in autoconf test mode to see which type of setuid function works */ diff --git a/source3/smbd/sec_ctx.c b/source3/smbd/sec_ctx.c index f8c8847a60..446810d535 100644 --- a/source3/smbd/sec_ctx.c +++ b/source3/smbd/sec_ctx.c @@ -23,6 +23,7 @@ #include "libcli/security/security_token.h" #include "auth.h" #include "smbprofile.h" +#include "lib/uid_wrapper/uid_wrapper.h" extern struct current_user current_user; diff --git a/source3/wscript b/source3/wscript index d7764289d2..bb0354af8f 100644 --- a/source3/wscript +++ b/source3/wscript @@ -25,6 +25,7 @@ def set_options(opt): opt.RECURSE('../dynconfig') opt.RECURSE('selftest') opt.RECURSE('../lib/nss_wrapper') + opt.RECURSE('../lib/uid_wrapper') opt.RECURSE('../lib/socket_wrapper') opt.RECURSE('../lib/tevent') opt.RECURSE('../lib/tdb_compat') diff --git a/source3/wscript_build b/source3/wscript_build index 74a6880725..693148f3be 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -817,7 +817,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules', + deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3 samba-modules uid_wrapper', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', @@ -912,7 +912,7 @@ bld.SAMBA3_LIBRARY('smbd_base', LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON cli_spoolss RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR cli_smb_common RPC_SERVER smbd_conn param_service - smbd_shim + smbd_shim uid_wrapper ''', private_library=True, vars=locals()) |