metze's autogenerate patch for version.h

(This used to be commit ae452e51b02672a56adf18aa7a7e365eeaba9272)

4 files changed, 46 insertions, 4 deletions

diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index a9e1b7bbb9..df7830ef83 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -34,7 +34,7 @@ static void fault_report(int sig)
 	counter++;
 
 	DEBUG(0,("===============================================================\n"));
-	DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),VERSION));
+	DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),SAMBA_VERSION_STRING));
 	DEBUG(0,("\nPlease read the appendix Bugs of the Samba HOWTO collection\n"));
 	DEBUG(0,("===============================================================\n"));
   
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 95a9a58b34..9a5a112022 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -69,7 +69,7 @@ static void popt_common_callback(poptContext con,
 		break;
 
 	case 'V':
-		printf( "Version %s\n", VERSION );
+		printf( "Version %s\n", SAMBA_VERSION_STRING);
 		exit(0);
 		break;
 
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index c0d0096806..71c7b9ab1c 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -384,7 +384,7 @@ void standard_sub_basic(const char *smb_name, char *str,size_t len)
 			string_sub(p,"%m", get_remote_machine_name(),l);
 			break;
 		case 'v' :
-			string_sub(p,"%v", VERSION,l);
+			string_sub(p,"%v", SAMBA_VERSION_STRING,l);
 			break;
 		case '$' :
 			p += expand_env_var(p,l);
@@ -539,7 +539,7 @@ char *alloc_sub_basic(const char *smb_name, const char *str)
 			t = realloc_string_sub(t, "%m", remote_machine);
 			break;
 		case 'v' :
-			t = realloc_string_sub(t, "%v", VERSION);
+			t = realloc_string_sub(t, "%v", SAMBA_VERSION_STRING);
 			break;
 		case '$' :
 			t = realloc_expand_env_var(t, p); /* Expand environment variables */
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
+}