summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald (Jerry) Carter <jerry@samba.org>2007-10-21 12:32:06 -0500
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-21 12:32:06 -0500
commit69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f (patch)
treeac7099a3a6d1883c5b8574fad271771256ab8b23
parent611479fd44433fe8bd26e05eae765bcab032edad (diff)
downloadsamba-69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f.tar.gz
samba-69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f.tar.bz2
samba-69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f.zip
Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH
which is used by mkversion.sh. (This used to be commit a62c7f9350322ab435244eafe6053fd5ee618973)
-rw-r--r--source3/VERSION2
-rw-r--r--source3/lib/version.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/VERSION b/source3/VERSION
index 858b627143..c97db4b04e 100644
--- a/source3/VERSION
+++ b/source3/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/source3/lib/version.c b/source3/lib/version.c
index cee06fc585..ca334a27d9 100644
--- 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;
-#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