From ca649f797cdc08a28fe43d5b47f4c84967b22837 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 24 Jan 2006 18:35:01 +0000
Subject: r13112: merge over some stuff from samba3

metze
(This used to be commit 7cb4e1bd0471f0c03fde25f6171565d74ab0549f)
---
 source4/lib/version.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4/lib')

diff --git a/source4/lib/version.c b/source4/lib/version.c
index a5733a953d..b7aa81a081 100644
--- a/source4/lib/version.c
+++ b/source4/lib/version.c
@@ -34,6 +34,11 @@ const char *samba_version_string(void)
  	const char *vendor_suffix = SAMBA_VERSION_VENDOR_SUFFIX;
 #else
  	const char *vendor_suffix = NULL;
+#endif
+#ifdef SAMBA_VERSION_VENDOR_PATCH
+ 	const char *vendor_patch = SAMBA_VERSION_VENDOR_PATCH;
+#else
+ 	const char *vendor_patch = NULL;
 #endif
 	static char *samba_version;
 	static BOOL init_samba_version;
@@ -43,10 +48,12 @@ const char *samba_version_string(void)
 	}
 
 	samba_version = talloc_asprintf(talloc_autofree_context(),
-					"%s%s%s%s%s%s",
+					"%s%s%s%s%s%s%s%s",
 					official_string,
 					(vendor_suffix?"-":""),
 					(vendor_suffix?vendor_suffix:""),
+					(vendor_patch?"-":""),
+					(vendor_patch?vendor_patch:""),
 					(release_nickname?" (":""),
 					(release_nickname?release_nickname:""),
 					(release_nickname?")":""));
-- 
cgit