r13658: More moving around of files:

 - Collect the generic utility functions into a lib/util/ (a la GLib is
		for the GNOME folks)
 - Remove even more files from include/
(This used to be commit ba62880f5b05c2a505dc7f54676b231197a7e707)

1 files changed, 43 insertions, 0 deletions

diff --git a/source4/dynconfig.c b/source4/dynconfig.c
index 742c96df2a..c72b64bcac 100644
--- a/source4/dynconfig.c
+++ b/source4/dynconfig.c
@@ -2,6 +2,7 @@
    Unix SMB/CIFS implementation.
    Copyright (C) 2001 by Martin Pool <mbp@samba.org>
    Copyright (C) Jim McDonough (jmcd@us.ibm.com)  2003.
+   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
@@ -18,6 +19,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "includes.h"
+#include "version.h"
+
 /**
  * @file dynconfig.c
  *
@@ -90,3 +94,42 @@ const char *dyn_JSDIR = JSDIR;
 
 const char *dyn_WINBINDD_SOCKET_DIR = WINBINDD_SOCKET_DIR;
 
+const char *samba_version_string(void)
+{
+	const char *official_string = SAMBA_VERSION_OFFICIAL_STRING;
+#ifdef SAMBA_VERSION_RELEASE_NICKNAME
+ 	const char *release_nickname = SAMBA_VERSION_RELEASE_NICKNAME;
+#else
+ 	const char *release_nickname = NULL;
+#endif
+#ifdef SAMBA_VERSION_VENDOR_SUFFIX
+ 	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;
+
+	if (init_samba_version) {
+		return samba_version;
+	}
+
+	samba_version = talloc_asprintf(talloc_autofree_context(),
+					"%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?")":""));
+
+	init_samba_version = True;
+	return samba_version;
+}