[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-test-2263-g92cc5d8
Michael Adam
obnox at samba.org
Fri Feb 15 10:52:56 GMT 2008
The branch, v3-2-test has been updated
via 92cc5d88bbc63edac3e7c4b483c1a75f91263827 (commit)
via fc08bf5a466b84e041a655eaa21a31006ede191f (commit)
via 113377a7929975bf29c2cfff1652781fae24e826 (commit)
via e846148116f84d1428b5c7e60a4181cc872cc3eb (commit)
via e78831cf59196ff6e4f9384f83dbc180c4e341e2 (commit)
via e5e621681db8300d7388167cba979cbdc8ff0aee (commit)
from c47005189690f5a89a3aabe919e9ce2d2604dc5e (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 92cc5d88bbc63edac3e7c4b483c1a75f91263827
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:52:15 2008 +0100
Add orphaned target smbiconv to "make everything" targets.
Michael
commit fc08bf5a466b84e041a655eaa21a31006ede191f
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:42:31 2008 +0100
Fix linkage of bin/smbiconv by adding needed libs and objects.
Michael
commit 113377a7929975bf29c2cfff1652781fae24e826
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:39:25 2008 +0100
Fix compiling torture/smbiconv.c: allow to use realloc directly by #undef realloc.
Michael
commit e846148116f84d1428b5c7e60a4181cc872cc3eb
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:27:42 2008 +0100
Remove torture/samtest.h - last trace of late samtest.
Michael
commit e78831cf59196ff6e4f9384f83dbc180c4e341e2
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:27:01 2008 +0100
Remove useless build-target bin/samtest. (The objects exist no more.)
Michael
commit e5e621681db8300d7388167cba979cbdc8ff0aee
Author: Michael Adam <obnox at samba.org>
Date: Fri Feb 15 11:15:13 2008 +0100
Fix build of cifs.spnego with libtdb.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 16 ++++++----------
source/torture/samtest.h | 37 -------------------------------------
source/torture/smbiconv.c | 1 +
3 files changed, 7 insertions(+), 47 deletions(-)
delete mode 100644 source/torture/samtest.h
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index dd6b0ce..730b1fd 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -214,7 +214,7 @@ BIN_PROGS = @EXTRA_BIN_PROGS@ @SMBMOUNT_PROGS@ \
EVERYTHING_PROGS = bin/debug2html at EXEEXT@ bin/smbfilter at EXEEXT@ \
bin/talloctort at EXEEXT@ bin/replacetort at EXEEXT@ \
bin/log2pcap at EXEEXT@ bin/sharesec at EXEEXT@ bin/ndrdump at EXEEXT@ \
- bin/vlp at EXEEXT@
+ bin/vlp at EXEEXT@ bin/smbiconv at EXEEXT@
SHLIBS = libtalloc libtdb @LIBWBCLIENT@ @LIBSMBCLIENT@ @LIBSMBSHAREMODES@ @LIBADDNS@ libnetapi
@@ -858,7 +858,7 @@ PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ)
-SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ)
+SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(SECRETS_OBJ) $(LIBSAMBA_OBJ) $(DOSERR_OBJ)
LOG2PCAP_OBJ = utils/log2pcaphex.o
@@ -1292,10 +1292,10 @@ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) @POPTLIBS@
-bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ) @BUILD_POPT@
+bin/cifs.spnego at EXEEXT@: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) -lkeyutils $(LIBS) \
- $(LIBSMBCLIENT_OBJ) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@
+ $(LIBSMBCLIENT_OBJ) $(KRB5LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@ @LIBTDB_LIBS@
bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
@echo Linking $@
@@ -1335,10 +1335,6 @@ bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
@POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
@LIBTDB_LIBS@ @WINBIND_LIBS@
-bin/samtest at EXEEXT@: $(SAMTEST_OBJ) @BUILD_POPT@
- @echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SAMTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(PASSDB_LIBS) $(KRB5LIBS) $(LDAP_LIBS)
-
bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
@@ -1400,9 +1396,9 @@ bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTDB_SHARE
@echo Linking $@
@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBTDB_LIBS@ @LIBWBCLIENT_SHARED@
-bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@
+bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTDB_SHARED@
@echo Linking $@
- @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) @POPTLIBS@
+ @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) @POPTLIBS@ @LIBTDB_LIBS@
bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@
@echo Linking $@
diff --git a/source/torture/samtest.h b/source/torture/samtest.h
deleted file mode 100644
index 5cde3fa..0000000
--- a/source/torture/samtest.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- SAM module tester
-
- Copyright (C) Jelmer Vernooij 2002
-
- Most of this code was ripped off of rpcclient.
- Copyright (C) Tim Potter 2000-2001
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-struct samtest_state {
- SAM_CONTEXT *context;
- NT_USER_TOKEN *token;
-};
-
-struct cmd_set {
- char *name;
- NTSTATUS (*fn)(struct samtest_state *sam, TALLOC_CTX *mem_ctx, int argc,
- char **argv);
- char *description;
- char *usage;
-};
-
-
diff --git a/source/torture/smbiconv.c b/source/torture/smbiconv.c
index 05a8c3d..c4d3016 100644
--- a/source/torture/smbiconv.c
+++ b/source/torture/smbiconv.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#undef realloc
static int
process_block (smb_iconv_t cd, const char *addr, size_t len, FILE *output)
--
Samba Shared Repository
More information about the samba-cvs
mailing list