Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH

[nivanova/samba-autobuild/.git] / source3 / lib / version.c

diff --git a/source3/lib/version.c b/source3/lib/version.c
index cee06fc58534d9a05a1464fdbeb5b4ecbbbe2a48..ca334a27d9d2fefca9c11af212577421672636bb 100644 (file)
--- a/source3/lib/version.c
+++ b/source3/lib/version.c
@@ -27,7 +27,7 @@ const char *samba_version_string(void)
 #else
        static fstring samba_version;
        static bool init_samba_version;
 #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
        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);
 
                SAMBA_VERSION_OFFICIAL_STRING,
                SAMBA_VERSION_VENDOR_SUFFIX);
 

-#ifdef SAMBA_VENDOR_PATCH
+#ifdef SAMBA_VERSION_VENDOR_PATCH

        remaining = sizeof(samba_version)-strlen(samba_version);
        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
 
        strlcat( samba_version, tmp_version, remaining-1 );
 #endif