mirror of
https://github.com/samba-team/samba.git
synced 2025-03-05 20:58:40 +03:00
Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH
which is used by mkversion.sh.
This commit is contained in:
parent
04d660bbb3
commit
a62c7f9350
@ -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=
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user