The branch, master has been updated via 3a4638db0351368d3b148bf547546f28fa0b1479 (commit) via d813a90d1887958085adf92c88359dc866c656ad (commit) from f603903cb01f0c1e8bba66ab8c5229c3e7724ae3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3a4638db0351368d3b148bf547546f28fa0b1479 Author: Michael Adam <ob...@samba.org> Date: Thu Mar 19 23:56:12 2009 +0100 add a versiontest program to print samba_version_string(). This is to allow for testing samba_version_string() without the need to compile any of the larger binaries like smbd or net... Michael commit d813a90d1887958085adf92c88359dc866c656ad Author: Michael Adam <ob...@samba.org> Date: Thu Mar 19 23:55:21 2009 +0100 version: fix handling of SAMBA_VERSION_VENDOR_PATCH. We need a string version of this, or else version.c does not compile. Michael ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 4 ++++ source3/{libnet/libnet.h => lib/version_test.c} | 19 ++++++++----------- source3/script/mkversion.sh | 3 ++- 3 files changed, 14 insertions(+), 12 deletions(-) copy source3/{libnet/libnet.h => lib/version_test.c} (71%) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index a7fc01d..cf74182 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1641,6 +1641,10 @@ bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED $(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) +bin/versiontest: $(BINARY_PREREQS) lib/version_test.o $(VERSION_OBJ) + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(VERSION_OBJ) lib/version_test.o + ##################################################################### # diff --git a/source3/libnet/libnet.h b/source3/lib/version_test.c similarity index 71% copy from source3/libnet/libnet.h copy to source3/lib/version_test.c index 570009c..880cfeb 100644 --- a/source3/libnet/libnet.h +++ b/source3/lib/version_test.c @@ -1,7 +1,7 @@ /* * Unix SMB/CIFS implementation. - * libnet Support - * Copyright (C) Guenther Deschner 2007 + * version_test - test program for samba_version_strion() + * Copyright (C) Michael Adam 2009 * * 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 @@ -17,13 +17,10 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef __LIBNET_H__ -#define __LIBNET_H__ +#include "includes.h" -#include "libnet/libnet_keytab.h" -#include "libnet/libnet_samsync.h" -#include "libnet/libnet_dssync.h" -#include "librpc/gen_ndr/libnet_join.h" -#include "libnet/libnet_proto.h" - -#endif +int main(void) +{ + printf("%s\n", samba_version_string()); + return 0; +} diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index a55aafc..ce9d2af 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -112,6 +112,7 @@ if test -n "${SAMBA_VERSION_VENDOR_SUFFIX}";then SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_SUFFIX}" if test -n "${SAMBA_VERSION_VENDOR_PATCH}";then echo "#define SAMBA_VERSION_VENDOR_PATCH ${SAMBA_VERSION_VENDOR_PATCH}" >> $OUTPUT_FILE + echo "#define SAMBA_VERSION_VENDOR_PATCH_STRING \"${SAMBA_VERSION_VENDOR_PATCH}\"" >> $OUTPUT_FILE SAMBA_VERSION_STRING="${SAMBA_VERSION_STRING}-${SAMBA_VERSION_VENDOR_PATCH}" fi fi @@ -130,7 +131,7 @@ cat >>$OUTPUT_FILE<<CEOF #else /* SAMBA_VERSION_VENDOR_FUNCTION */ # ifdef SAMBA_VERSION_VENDOR_SUFFIX # ifdef SAMBA_VERSION_VENDOR_PATCH -# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH +# define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX "-" SAMBA_VERSION_VENDOR_PATCH_STRING # else /* SAMBA_VERSION_VENDOR_PATCH */ # define SAMBA_VERSION_STRING SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX # endif /* SAMBA_VERSION_VENDOR_SUFFIX */ -- Samba Shared Repository