s3: Use SBVAL in put_long_date_timespec

[kai/samba.git] / source3 / lib / version.c

diff --git a/source3/lib/version.c b/source3/lib/version.c
index 3cae02ad2ee096c2cae125c1b707f1fdcc891e03..e81f463586e296382be26b440c3fd8c7d35d6fc8 100644 (file)
--- a/source3/lib/version.c
+++ b/source3/lib/version.c
@@ -19,43 +19,9 @@
 */
 
 #include "includes.h"
-#include <assert.h>
+#include "version.h"
 
 const char *samba_version_string(void)
 {
-#ifndef SAMBA_VERSION_VENDOR_SUFFIX
-       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
+       return SAMBA_VERSION_STRING;
 }