[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-88-g33f690b

[Gerald (Jerry) Carter]

The branch, v3-2-test has been updated
       via  33f690b3de03dc300590c3f69718f608b104a529 (commit)
       via  a62c7f9350322ab435244eafe6053fd5ee618973 (commit)
      from  67328bd27b1e881a4bcdd5160133afa9a267eaac (commit)

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


- Log -----------------------------------------------------------------
commit 33f690b3de03dc300590c3f69718f608b104a529
Merge: a62c7f9350322ab435244eafe6053fd5ee618973 67328bd27b1e881a4bcdd5160133afa9a267eaac
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Sun Oct 21 12:39:15 2007 -0500

    Merge branch 'v3-2-test' of git://git.samba.org/samba into v3-2-test

commit a62c7f9350322ab435244eafe6053fd5ee618973
Author: Gerald (Jerry) Carter <jerry at samba.org>
Date:   Sun Oct 21 12:32:06 2007 -0500

    Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH
    which is used by mkversion.sh.

-----------------------------------------------------------------------

Summary of changes:
 source/VERSION       |    2 +-
 source/lib/version.c |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/VERSION b/source/VERSION
index 858b627..c97db4b 100644
--- a/source/VERSION
+++ b/source/VERSION
@@ -96,4 +96,4 @@ SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
 SAMBA_VERSION_VENDOR_SUFFIX="test"
-SAMBA_VENDOR_PATCH=
+SAMBA_VERSION_VENDOR_PATCH=
diff --git a/source/lib/version.c b/source/lib/version.c
index cee06fc..ca334a2 100644
--- a/source/lib/version.c
+++ b/source/lib/version.c
@@ -27,7 +27,7 @@ const char *samba_version_string(void)
 #else
 	static fstring samba_version;
 	static bool init_samba_version;
-#ifdef SAMBA_VENDOR_PATCH
+#ifdef SAMBA_VERSION_VENDOR_PATCH
 	fstring tmp_version;
 	size_t remaining;
 #endif
@@ -39,9 +39,9 @@ const char *samba_version_string(void)
 		SAMBA_VERSION_OFFICIAL_STRING,
 		SAMBA_VERSION_VENDOR_SUFFIX);
 
-#ifdef SAMBA_VENDOR_PATCH
+#ifdef SAMBA_VERSION_VENDOR_PATCH
 	remaining = sizeof(samba_version)-strlen(samba_version);
-	snprintf( tmp_version, sizeof(tmp_version),  "-%d", SAMBA_VENDOR_PATCH );
+	snprintf( tmp_version, sizeof(tmp_version),  "-%d", SAMBA_VERSION_VENDOR_PATCH );
 	strlcat( samba_version, tmp_version, remaining-1 );
 #endif
 


-- 
Samba Shared Repository