Fix make test_pam_modules

[ira/wip.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5a29a52c19994d93de4ec6d19f1fca72b22f451a..c6acb537a4e28b06625206eda984e2e4f3ee75f1 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -53,6 +53,7 @@ AWK=@AWK@
 PICFLAG=@PICFLAG@
 DYNEXP=@DYNEXP@
 PERL=@PERL@
+LIBDL=@LIBDL@
 
 PIDL_ARGS=@PIDL_ARGS@
 
@@ -477,6 +478,8 @@ CLDAP_OBJ = libads/cldap.o \
        ../lib/util/idtree.o \
        $(LIBCLI_LDAP_MESSAGE_OBJ) $(LIBCLI_LDAP_NDR_OBJ) $(LIBTSOCKET_OBJ)
 
+TLDAP_OBJ = lib/tldap.o lib/tldap_util.o
+
 LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \
             libsmb/clikrb5.o libsmb/clispnego.o ../lib/util/asn1.o \
             libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
@@ -750,13 +753,19 @@ SMBD_OBJ_SRV = smbd/files.o smbd/chgpasswd.o smbd/connection.o \
               smbd/dmapi.o smbd/signing.o \
               smbd/file_access.o \
               smbd/dnsregister.o smbd/globals.o \
-              smbd/smb2_server.o smbd/smb2_negprot.o \
-              smbd/smb2_sesssetup.o smbd/smb2_tcon.o smbd/smb2_glue.o \
+              smbd/smb2_server.o \
+              smbd/smb2_signing.o \
+              smbd/smb2_glue.o \
+              smbd/smb2_negprot.o \
+              smbd/smb2_sesssetup.o \
+              smbd/smb2_tcon.o \
               smbd/smb2_create.o \
               smbd/smb2_close.o \
               smbd/smb2_flush.o \
               smbd/smb2_read.o \
-              smbd/smb2_keepalive.o smbd/smb2_signing.o \
+              smbd/smb2_write.o \
+              smbd/smb2_ioctl.o \
+              smbd/smb2_keepalive.o \
               $(MANGLE_OBJ) @VFS_STATIC@
 
 SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
@@ -2562,6 +2571,10 @@ bin/ldapsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ldap.o passdb/pdb_nds.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) passdb/pdb_ldap.o passdb/pdb_nds.o $(LDAP_LIBS)
 
+bin/ads.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_ads.o
+       @echo "Building plugin $@"
+       @$(SHLD_MODULE) passdb/pdb_ads.o
+
 bin/tdbsam.@SHLIBEXT@: $(BINARY_PREREQS) passdb/pdb_tdb.o
        @echo "Building plugin $@"
        @$(SHLD_MODULE) passdb/pdb_tdb.o
@@ -3152,7 +3165,7 @@ test_pam_modules:: pam_modules
        @$(LIB_PATH_VAR)=./bin && \
        export $(LIB_PATH_VAR) && \
        for module in $(PAM_MODULES); do \
-               ./script/tests/dlopen.sh -lpam -ldl bin/$${module}.@SHLIBEXT@ \
+               ./script/tests/dlopen.sh -lpam ${LIBDL} bin/$${module}.@SHLIBEXT@ \
                        || exit 1; \
        done
 
@@ -3165,7 +3178,7 @@ TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_con
 
 test:: all torture timelimit
        @echo Running Test suite
-       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
+       @LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all ${TEST_EXTRA_ARGS}
 
 valgrindtest:: all torture timelimit
        @echo Running Test suite with valgrind
@@ -3185,6 +3198,7 @@ selftest:: all torture timelimit
        @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
                SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
                PERL="$(PERL)" PYTHON="$(PYTHON)" \
+               NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" \
                $(PERL) $(selftestdir)/selftest.pl \
                --prefix=${selftest_prefix} --target=samba3 \
                --testlist="$(srcdir)/selftest/tests.sh|" \