[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-538-ga75c184

[Michael Adam]

The branch, v3-4-test has been updated
       via  a75c184cafbb80adb0a3b056e55608d2d263a0c6 (commit)
       via  21bf5cac5f352f51432ad717b2e5051a3a63cac9 (commit)
      from  c50490e4af2f4270cf8b59f868b45630efb55efd (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit a75c184cafbb80adb0a3b056e55608d2d263a0c6
Author: Michael Adam <obnox at 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 21bf5cac5f352f51432ad717b2e5051a3a63cac9
Author: Michael Adam <obnox at 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 6cd5898..1bf9555 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1630,6 +1630,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