summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/fault.c2
-rw-r--r--source3/lib/popt_common.c2
-rw-r--r--source3/lib/substitute.c2
-rw-r--r--source3/lib/version.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index c24fea1ca9..a1530987f3 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -38,7 +38,7 @@ static void fault_report(int sig)
counter++;
DEBUGSEP(0);
- DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),SAMBA_VERSION_STRING));
+ DEBUG(0,("INTERNAL ERROR: Signal %d in pid %d (%s)",sig,(int)sys_getpid(),samba_version_string()));
DEBUG(0,("\nPlease read the Trouble-Shooting section of the Samba3-HOWTO\n"));
DEBUG(0,("\nFrom: http://www.samba.org/samba/docs/Samba3-HOWTO.pdf\n"));
DEBUGSEP(0);
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 115133089c..e14477c979 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -73,7 +73,7 @@ static void popt_common_callback(poptContext con,
if (reason == POPT_CALLBACK_REASON_POST) {
if (PrintSambaVersionString) {
- printf( "Version %s\n", SAMBA_VERSION_STRING);
+ printf( "Version %s\n", samba_version_string());
exit(0);
}
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index acfe55d761..b4f5f70fa0 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -659,7 +659,7 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name,
: "");
break;
case 'v' :
- a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING);
+ a_string = realloc_string_sub(a_string, "%v", samba_version_string());
break;
case 'w' :
a_string = realloc_string_sub(a_string, "%w", lp_winbind_separator());
diff --git a/source3/lib/version.c b/source3/lib/version.c
index 55fb53c5db..e81f463586 100644
--- a/source3/lib/version.c
+++ b/source3/lib/version.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
-#include <assert.h>
+#include "version.h"
const char *samba_version_string(void)
{