Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH

which is used by mkversion.sh.

diff --git a/source/VERSION b/source/VERSION
index 858b6271436f21d239bf1684674f5d80414d3b22..c97db4b04eedc33d90cda0129b3e8f88db7cca63 100644 (file)
--- 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 cee06fc58534d9a05a1464fdbeb5b4ecbbbe2a48..ca334a27d9d2fefca9c11af212577421672636bb 100644 (file)
--- 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