From 8bfe26b62db2e671b143d93a5428f8fb64a9df05 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 20 Aug 2003 17:13:38 +0000 Subject: metze's autogenerate patch for version.h (This used to be commit ae452e51b02672a56adf18aa7a7e365eeaba9272) --- source3/lib/version.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 source3/lib/version.c (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c new file mode 100644 index 0000000000..99f836c2d5 --- /dev/null +++ b/source3/lib/version.c @@ -0,0 +1,42 @@ +/* + Unix SMB/CIFS implementation. + Samba Version functions + + Copyright (C) Stefan Metzmacher 2003 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +*/ + +#include "includes.h" + +const char *samba_version_string(void) +{ +#ifndef SAMBA_VERSION_VENDOR_SUFFIX + return SAMBA_VERSION_OFFICIAL_STRING; +#else + static fstring samba_version; + static BOOL init_samba_version; + + if (init_samba_version) + return samba_version; + + snprintf(samba_version,sizeof(samba_version),"%s-%s", + SAMBA_VERSION_OFFICIAL_STRING, + SAMBA_VERSION_VENDOR_SUFFIX); + + init_samba_version = True; + return samba_version; +#endif +} -- cgit From 19907887fcc1fa96f947298da752f410eb23ad1e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 23 Jan 2006 22:02:52 +0000 Subject: r13093: adding vendor patch level string as announced on samba-technical ml (This used to be commit d40f06018b9197c35a10cc9ab284dd596244f47b) --- source3/lib/version.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 99f836c2d5..3bd8304012 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -27,6 +27,7 @@ const char *samba_version_string(void) return SAMBA_VERSION_OFFICIAL_STRING; #else static fstring samba_version; + fstring tmp_version; static BOOL init_samba_version; if (init_samba_version) @@ -36,6 +37,11 @@ const char *samba_version_string(void) SAMBA_VERSION_OFFICIAL_STRING, SAMBA_VERSION_VENDOR_SUFFIX); +#ifdef SAMBA_VENDOR_PATCH + fstr_sprintf( tmp_version, "-%d", SAMBA_VENDOR_PATCH ); + fstrcat( samba_version, tmp_version ); +#endif + init_samba_version = True; return samba_version; #endif -- cgit From 8724ea7ef51923fbd7f79dc3b070f0d462d78ac6 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 30 Jan 2006 17:42:42 +0000 Subject: r13231: apparently strncat() is converted to strcat() on RH7.3 and similar systems. Fix the build on those boxes (This used to be commit 0b8ed8136b5c5b9b7bb5615dc8dc27eec7c49506) --- source3/lib/version.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 3bd8304012..a20d650025 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -29,6 +29,7 @@ const char *samba_version_string(void) static fstring samba_version; fstring tmp_version; static BOOL init_samba_version; + size_t remaining; if (init_samba_version) return samba_version; @@ -38,8 +39,9 @@ const char *samba_version_string(void) SAMBA_VERSION_VENDOR_SUFFIX); #ifdef SAMBA_VENDOR_PATCH - fstr_sprintf( tmp_version, "-%d", SAMBA_VENDOR_PATCH ); - fstrcat( samba_version, tmp_version ); + remaining = sizeof(samba_version)-strlen(samba_version); + snprintf( tmp_version, sizeof(tmp_version), "-%d", SAMBA_VENDOR_PATCH ); + strlcat( samba_version, tmp_version, remaining-1 ); #endif init_samba_version = True; -- cgit From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 9 Jul 2007 19:25:36 +0000 Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to be commit 407e6e695b8366369b7c76af1ff76869b45347b3) --- source3/lib/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index a20d650025..8fc49d52c1 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, -- cgit From 5e54558c6dea67b56bbfaba5698f3a434d3dffb6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 00:52:41 +0000 Subject: r23784: use the GPLv3 boilerplate as recommended by the FSF and the license text (This used to be commit b0132e94fc5fef936aa766fb99a306b3628e9f07) --- source3/lib/version.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 8fc49d52c1..6e469956fa 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -15,8 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with this program. If not, see . */ #include "includes.h" -- cgit From 48cd61d30ed46e2c61c0df9d510f50ae7a11accd Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 15 Oct 2007 15:52:30 -0700 Subject: Fix warning messages for unused variables. Jeremy. (This used to be commit 406737cd9a34ac498e5823b380e1768d41e16c1b) --- source3/lib/version.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 6e469956fa..9835ad4a9c 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -26,9 +26,11 @@ const char *samba_version_string(void) return SAMBA_VERSION_OFFICIAL_STRING; #else static fstring samba_version; - fstring tmp_version; static BOOL init_samba_version; +#ifdef SAMBA_VENDOR_PATCH + fstring tmp_version; size_t remaining; +#endif if (init_samba_version) return samba_version; -- cgit From 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 18 Oct 2007 17:40:25 -0700 Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in various places whilst doing this (places that assumed BOOL == int). I also need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f) --- source3/lib/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 9835ad4a9c..cee06fc585 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -26,7 +26,7 @@ const char *samba_version_string(void) return SAMBA_VERSION_OFFICIAL_STRING; #else static fstring samba_version; - static BOOL init_samba_version; + static bool init_samba_version; #ifdef SAMBA_VENDOR_PATCH fstring tmp_version; size_t remaining; -- cgit From 69c6f16e31d0adfc7efb077e09afbb8ff5fb2b0f Mon Sep 17 00:00:00 2001 From: "Gerald (Jerry) Carter" Date: Sun, 21 Oct 2007 12:32:06 -0500 Subject: Correct VERSION and version.c to use SAMBA_VERSION_VENDOR_PATCH which is used by mkversion.sh. (This used to be commit a62c7f9350322ab435244eafe6053fd5ee618973) --- source3/lib/version.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/lib/version.c') 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 -- cgit From dd4e99c9d7111fe1fab9b0a968c1321425f83429 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 16 Dec 2007 00:03:56 +0100 Subject: Remove a static fstring (This used to be commit a9c62c57db9e580640d0265b08b3178496de76a8) --- source3/lib/version.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index ca334a27d9..204c2044a8 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -19,33 +19,41 @@ */ #include "includes.h" +#include const char *samba_version_string(void) { #ifndef SAMBA_VERSION_VENDOR_SUFFIX return SAMBA_VERSION_OFFICIAL_STRING; #else - static fstring samba_version; - static bool init_samba_version; + static char *samba_version; + int res; #ifdef SAMBA_VERSION_VENDOR_PATCH - fstring tmp_version; - size_t remaining; + char *tmp_version; #endif - if (init_samba_version) + if (samba_version != NULL) return samba_version; - snprintf(samba_version,sizeof(samba_version),"%s-%s", - SAMBA_VERSION_OFFICIAL_STRING, - SAMBA_VERSION_VENDOR_SUFFIX); + res = asprintf(&samba_version, "%s-%s", + SAMBA_VERSION_OFFICIAL_STRING, + SAMBA_VERSION_VENDOR_SUFFIX); + /* + * Can't use smb_panic here due to dependencies + */ + assert(res != -1); #ifdef SAMBA_VERSION_VENDOR_PATCH - remaining = sizeof(samba_version)-strlen(samba_version); - snprintf( tmp_version, sizeof(tmp_version), "-%d", SAMBA_VERSION_VENDOR_PATCH ); - strlcat( samba_version, tmp_version, remaining-1 ); + res = asprintf(&tmp_version, "%s-%d", samba_version, + SAMBA_VERSION_VENDOR_PATCH); + /* + * Can't use smb_panic here due to dependencies + */ + assert(res != -1); + + samba_version = tmp_version; #endif - init_samba_version = True; return samba_version; #endif } -- cgit From a0bd9d97a3a701fdb1f9a48ce925f63b786a8070 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 19 Jan 2008 15:14:45 +0100 Subject: Tiny memory leak in lib/version.c Hi, while implementing the extra_info version stuff, it occured to me that samba_version_string() potentially allocates memory which is unused but never free'd. If SAMBA_VERSION_VENDOR_PATCH is defined, a second call to asprintf takes place. The result is stored in tmp_version. Afterwards, samba_version is set to tmp_version without free'ing samba_version first. Looks like a simple free(samba_version) is missing. Patch against 3.2-test below. Ok, this only happens once over the lifetime of the application, so it's no big deal, but I though it doesn't hurt to mention it. Corinna * lib/version.c (samba_version_string): Free samba_version before setting to tmp_version. (This used to be commit 373a23d48f2dd24e65dbf814ea58b4add2322128) --- source3/lib/version.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 204c2044a8..cbb70ae8a6 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -51,6 +51,7 @@ const char *samba_version_string(void) */ assert(res != -1); + free(samba_version); samba_version = tmp_version; #endif -- cgit From 07e07f696ad10f3a5d7a0d9de656ff13600ac97d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 19 Jan 2008 19:31:02 +0100 Subject: Use SAFE_FREE instead of free (This used to be commit 999647329028147d7c29a3348202641b3e03430e) --- source3/lib/version.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index cbb70ae8a6..3cae02ad2e 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -51,7 +51,8 @@ const char *samba_version_string(void) */ assert(res != -1); - free(samba_version); + SAFE_FREE(samba_version); + samba_version = tmp_version; #endif -- cgit From 559603ad693ede382c566cb8bbd8e6bd8d5750a6 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 22 Jan 2008 11:33:17 +0100 Subject: Get Samba version or capability information from Windows On Jan 21 16:18, Danilo Almeida wrote: > Corina wrote: > > > + time_t samba_gitcommitdate; > > And: > > > + SIVAL(pdata,28,extended_info.samba_gitcommitdate); > > + memcpy(pdata+32,extended_info.samba_version_string,32); > > Note that you are dropping bits on a system w/64-bit time_t, and that this has the 2038 problem. Right. I changed samba_gitcommitdate from time_t to NTTIME and shortened samba_version_string to 28 bytes. New patch below. Thanks, Corinna (This used to be commit 28aa1c199d3a22cda34afcaab49c0561eeb0abcb) --- source3/lib/version.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 3cae02ad2e..38c4f45ac6 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -59,3 +59,32 @@ const char *samba_version_string(void) return samba_version; #endif } + +void samba_extended_info_version(struct smb_extended_info *extended_info) +{ + assert(extended_info != NULL); + + extended_info->samba_magic = SAMBA_EXTENDED_INFO_MAGIC; + extended_info->samba_version = ((SAMBA_VERSION_MAJOR & 0xff) << 24) + | ((SAMBA_VERSION_MINOR & 0xff) << 16) + | ((SAMBA_VERSION_RELEASE & 0xff) << 8); +#ifdef SAMBA_VERSION_REVISION + extended_info->samba_version |= (tolower(*SAMBA_VERSION_REVISION) - 'a' + 1) & 0xff; +#endif +#ifdef SAMBA_VERSION_RC_RELEASE + extended_info->samba_subversion |= (SAMBA_VERSION_RC_RELEASE & 0xff) << 24; +#else +#ifdef SAMBA_VERSION_PRE_RELEASE + extended_info->samba_subversion |= (SAMBA_VERSION_PRE_RELEASE & 0xff) << 16; +#endif +#endif +#ifdef SAMBA_VERSION_VENDOR_PATCH + extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff); +#endif + /* FIXME: samba_gitcommitdate should contain the git commit date. */ + unix_to_nt_time(&extended_info->samba_gitcommitdate, time(NULL)); + + snprintf (extended_info->samba_version_string, + SAMBA_EXTENDED_INFO_VERSION_STRING_LENGTH, + "%s", samba_version_string()); +} -- cgit From 1d99598ca3f21dd863c8d63698f8af2b3b77759b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 22 Jan 2008 12:46:51 +0100 Subject: Avoid use of uninitialized memory (This used to be commit 85123aacdb13e97c3f44aeded1c80e13af53d83d) --- source3/lib/version.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 38c4f45ac6..dff45f6259 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -84,7 +84,10 @@ void samba_extended_info_version(struct smb_extended_info *extended_info) /* FIXME: samba_gitcommitdate should contain the git commit date. */ unix_to_nt_time(&extended_info->samba_gitcommitdate, time(NULL)); + memset(extended_info->samba_version_string, 0, + sizeof(extended_info->samba_version_string)); + snprintf (extended_info->samba_version_string, - SAMBA_EXTENDED_INFO_VERSION_STRING_LENGTH, + sizeof(extended_info->samba_version_string), "%s", samba_version_string()); } -- cgit From d4d962f691d13f36226157c38f706ee4d10b9150 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 22 Jan 2008 13:00:22 +0100 Subject: Move samba_extended_info_version to smbd/trans2.c This is right now only used there, and in version.c it gave linker errors because some binaries (e.g. smbmnt) don't link in time.o (This used to be commit 1f0eaaa5911f893c822465a26fe49ab65afb0730) --- source3/lib/version.c | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index dff45f6259..3cae02ad2e 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -59,35 +59,3 @@ const char *samba_version_string(void) return samba_version; #endif } - -void samba_extended_info_version(struct smb_extended_info *extended_info) -{ - assert(extended_info != NULL); - - extended_info->samba_magic = SAMBA_EXTENDED_INFO_MAGIC; - extended_info->samba_version = ((SAMBA_VERSION_MAJOR & 0xff) << 24) - | ((SAMBA_VERSION_MINOR & 0xff) << 16) - | ((SAMBA_VERSION_RELEASE & 0xff) << 8); -#ifdef SAMBA_VERSION_REVISION - extended_info->samba_version |= (tolower(*SAMBA_VERSION_REVISION) - 'a' + 1) & 0xff; -#endif -#ifdef SAMBA_VERSION_RC_RELEASE - extended_info->samba_subversion |= (SAMBA_VERSION_RC_RELEASE & 0xff) << 24; -#else -#ifdef SAMBA_VERSION_PRE_RELEASE - extended_info->samba_subversion |= (SAMBA_VERSION_PRE_RELEASE & 0xff) << 16; -#endif -#endif -#ifdef SAMBA_VERSION_VENDOR_PATCH - extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff); -#endif - /* FIXME: samba_gitcommitdate should contain the git commit date. */ - unix_to_nt_time(&extended_info->samba_gitcommitdate, time(NULL)); - - memset(extended_info->samba_version_string, 0, - sizeof(extended_info->samba_version_string)); - - snprintf (extended_info->samba_version_string, - sizeof(extended_info->samba_version_string), - "%s", samba_version_string()); -} -- cgit From 2a8ebdca535aed431d51270a2bdcafce0b55bb12 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 17 Jul 2008 12:25:31 +0200 Subject: Simplify samba_version_string. This adds a new macro for a vender version function which will be returned by the samba_version_string() function if defined. Signed-off-by: Andreas Schneider Signed-off-by: Stefan Metzmacher (This used to be commit 8b9301fbc73f28c657ec81c605760a0ff7a1973a) --- source3/lib/version.c | 45 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 34 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 3cae02ad2e..3982646f56 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -23,39 +23,16 @@ const char *samba_version_string(void) { -#ifndef SAMBA_VERSION_VENDOR_SUFFIX +#ifdef SAMBA_VERSION_VENDOR_FUNCTION + return SAMBA_VERSION_VENDOR_FUNCTION; +#else /* SAMBA_VERSION_VENDOR_FUNCTION */ + #ifdef SAMBA_VERSION_VENDOR_SUFFIX + #ifdef SAMBA_VERSION_VENDOR_PATCH + return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \ + "-" SAMBA_VERSION_VENDOR_PATCH; + #endif /* SAMBA_VERSION_VENDOR_PATCH */ + return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX; + #endif /* SAMBA_VERSION_VENDOR_SUFFIX */ +#endif /* SAMBA_VERSION_VENDOR_FUNCTION */ return SAMBA_VERSION_OFFICIAL_STRING; -#else - static char *samba_version; - int res; -#ifdef SAMBA_VERSION_VENDOR_PATCH - char *tmp_version; -#endif - - if (samba_version != NULL) - return samba_version; - - res = asprintf(&samba_version, "%s-%s", - SAMBA_VERSION_OFFICIAL_STRING, - SAMBA_VERSION_VENDOR_SUFFIX); - /* - * Can't use smb_panic here due to dependencies - */ - assert(res != -1); - -#ifdef SAMBA_VERSION_VENDOR_PATCH - res = asprintf(&tmp_version, "%s-%d", samba_version, - SAMBA_VERSION_VENDOR_PATCH); - /* - * Can't use smb_panic here due to dependencies - */ - assert(res != -1); - - SAFE_FREE(samba_version); - - samba_version = tmp_version; -#endif - - return samba_version; -#endif } -- cgit From 41ebc6fe73fc2a2ad845c2ad0109222612edf1a3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 12 Sep 2008 12:38:54 +0200 Subject: Reorder defines for version for consistency with Samba 4. (This used to be commit fe36d83508a6b1a8de5ad58ec1d0c80cda7b4a21) --- source3/lib/version.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'source3/lib/version.c') diff --git a/source3/lib/version.c b/source3/lib/version.c index 3982646f56..55fb53c5db 100644 --- a/source3/lib/version.c +++ b/source3/lib/version.c @@ -23,16 +23,5 @@ const char *samba_version_string(void) { -#ifdef SAMBA_VERSION_VENDOR_FUNCTION - return SAMBA_VERSION_VENDOR_FUNCTION; -#else /* SAMBA_VERSION_VENDOR_FUNCTION */ - #ifdef SAMBA_VERSION_VENDOR_SUFFIX - #ifdef SAMBA_VERSION_VENDOR_PATCH - return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX \ - "-" SAMBA_VERSION_VENDOR_PATCH; - #endif /* SAMBA_VERSION_VENDOR_PATCH */ - return SAMBA_VERSION_OFFICIAL_STRING "-" SAMBA_VERSION_VENDOR_SUFFIX; - #endif /* SAMBA_VERSION_VENDOR_SUFFIX */ -#endif /* SAMBA_VERSION_VENDOR_FUNCTION */ - return SAMBA_VERSION_OFFICIAL_STRING; + return SAMBA_VERSION_STRING; } -- cgit