# man pages language(s)
man_langs = "@manlangs@"
+LIBSMBCLIENT=bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
LIBSMBCLIENT_MAJOR=0
LIBSMBCLIENT_MINOR=1
lib/util_getent.o lib/util_pw.o lib/access.o lib/smbrun.o \
lib/bitmap.o lib/crc32.o lib/snprintf.o lib/dprintf.o \
lib/xfile.o lib/wins_srv.o \
- lib/util_str.o lib/util_sid.o lib/util_uuid.o \
+ lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \
lib/util_unistr.o lib/util_file.o lib/data_blob.o \
lib/util.o lib/util_sock.o lib/util_sec.o \
lib/talloc.o lib/hash.o lib/substitute.o lib/fsusage.o \
LIBNMB_OBJ = libsmb/unexpected.o libsmb/namecache.o libsmb/nmblib.o \
libsmb/namequery.o
-LIBNTLMSSP_OBJ = libsmb/ntlmssp.o libsmb/ntlmssp_parse.o
+LIBNTLMSSP_OBJ = libsmb/ntlmssp.o libsmb/ntlmssp_parse.o libsmb/ntlmssp_sign.o
LIBSAMBA_OBJ = libsmb/nterr.o libsmb/smbdes.o libsmb/smbencrypt.o
libsmb/clirap.o libsmb/clierror.o libsmb/climessage.o \
libsmb/clireadwrite.o libsmb/clilist.o libsmb/cliprint.o \
libsmb/clitrans.o libsmb/clisecdesc.o libsmb/clidgram.o \
- libsmb/clistr.o \
+ libsmb/clistr.o libsmb/smb_signing.o \
libsmb/smberr.o libsmb/credentials.o libsmb/pwd_cache.o \
libsmb/clioplock.o libsmb/errormap.o libsmb/clirap2.o \
libsmb/passchange.o libsmb/doserr.o \
rpc_client/cli_spoolss.o rpc_client/cli_spoolss_notify.o \
rpc_client/cli_ds.o libsmb/namequery_dc.o
-LIBMSRPC_SERVER_OBJ = libsmb/trust_passwd.o
+LIBMSRPC_SERVER_OBJ = libsmb/trusts_util.o
REGOBJS_OBJ = registry/reg_objects.o
REGISTRY_OBJ = registry/reg_frontend.o registry/reg_cachehook.o registry/reg_printing.o \
PASSDB_OBJ = $(PASSDB_GET_SET_OBJ) passdb/passdb.o passdb/pdb_interface.o \
passdb/machine_sid.o passdb/pdb_smbpasswd.o \
passdb/pdb_tdb.o passdb/pdb_ldap.o \
- passdb/pdb_unix.o passdb/util_sam_sid.o \
- passdb/pdb_compat.o passdb/pdb_nisplus.o passdb/privileges.o
+ passdb/pdb_unix.o passdb/pdb_guest.o passdb/util_sam_sid.o \
+ passdb/pdb_compat.o passdb/pdb_nisplus.o \
+ passdb/privileges.o
XML_OBJ = modules/xml.o
MYSQL_OBJ = modules/mysql.o
smbd/vfs.o smbd/vfs-wrap.o smbd/statcache.o \
smbd/posix_acls.o lib/sysacls.o lib/server_mutex.o \
smbd/process.o smbd/service.o smbd/error.o \
- printing/printfsp.o lib/util_seaccess.o smbd/srvstr.o \
+ printing/printfsp.o lib/util_seaccess.o \
smbd/build_options.o \
smbd/change_trust_pw.o \
$(MANGLE_OBJ)
$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
-libsmbclient: bin/libsmbclient.a @LIBSMBCLIENT_SHARED@
+# It would be nice to build a static bigballofmud too, but when I try
+# I get linker errors about dl_open and similar things. I'm not sure
+# if it can be fixed or if they just can't be called from a static
+# library.
+
+libsmbclient: $(LIBSMBCLIENT)
bin/librpc_lsarpc.@SHLIBEXT@: $(RPC_LSA_OBJ)
@echo "Linking $@"
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(TDBBACKUP_OBJ)
+bin/t_strcmp@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_strcmp.o
+ $(CC) $(FLAGS) -o $@ $(LIBS) torture/t_strcmp.o -L ./bin -lbigballofmud
+
+bin/t_stringoverflow@EXEEXT@: bin/libbigballofmud.@SHLIBEXT@ torture/t_stringoverflow.o
+ $(CC) $(FLAGS) -o $@ torture/t_stringoverflow.o -L./bin -lbigballofmud
+
install: installbin installman installscripts installdat installswat
# DESTDIR is used here to prevent packagers wasting their time
$(PYTHON) python/setup.py install
python_clean:
- @if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
+ @-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
# revert to the previously installed version
revert:
clean: delheaders python_clean
-rm -f core */*~ *~ */*.o */*.po */*.po32 */*.@SHLIBEXT@ \
- $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) .headers.stamp
+ $(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(MODULES) $(TORTURE_PROGS) $(LIBSMBCLIENT) .headers.stamp
# Making this target will just make sure that the prototype files
# exist, not necessarily that they are up to date. Since they're
Makefile: $(srcdir)/Makefile.in config.status
@echo "WARNING: you need to run ./config.status"
-test_prefix=/tmp/test-samba
-# Run regression suite using the external "satyr" framework
-check:
- @echo "** Sorry, samba self-test without installation does not work "
- @echo "** yet. Please try specifying a scratch directory to"
- @echo "** ./configure --prefix DIR"
- @echo "** then run \"make install installcheck\""
- exit 1
-
-# -rm -rf $(test_prefix)/lib
-# mkdir $(test_prefix)/lib -p ./testdir
-# PATH=$(builddir)/bin:$(PATH) \
-# SATYR_SUITEDIR=../testsuite/build_farm/ prefix=$(test_prefix) \
-# testdir=./testdir $(SHELL) satyr
-
-# Run regression suite on the installed version.
-
-# `installcheck'
-# Perform installation tests (if any). The user must build and
-# install the program before running the tests. You should not
-# assume that `$(bindir)' is in the search path.
-
-dangerous-installcheck:
- mkdir -p $(BASEDIR)/lib
- mkdir -p $(BASEDIR)/var
- PATH=$(BINDIR):$(SBINDIR):$(PATH) \
- SATYR_DISCOURAGE=1 \
- SATYR_SUITEDIR=../testsuite/satyr/ prefix=$(BASEDIR) \
- LIBSMB_PROG=$(SBINDIR)/smbd \
- testdir=./testdir $(SHELL) satyr
+######################################################################
+# Samba Testing Framework
+
+# FIXME: LD_LIBRARY_PATH is not portable, but in the absence of
+# libtool I don't know a better way to do it. Perhaps we should fix
+# libbigballofmud to link statically?
+
+check: check-programs
+ LD_LIBRARY_PATH="`pwd`/bin:$$LD_LIBRARY_PATH" \
+ PATH="`pwd`/bin:$$PATH" \
+ python stf/standardcheck.py
+
+# These are called by the test suite
+check-programs: bin/t_strcmp
+