Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test

(This used to be commit c273d63f94c430a4f553085efb0d6e31a99e5853)

2 files changed, 18 insertions, 5 deletions

diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i
index f0bc156abd..81be7d5c16 100644
--- a/source4/scripting/python/misc.i
+++ b/source4/scripting/python/misc.i
@@ -26,6 +26,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "librpc/ndr/libndr.h"
+#include "version.h"
 %}
 
 %import "stdint.i"
@@ -77,10 +78,15 @@ bool samdb_set_domain_sid(struct ldb_context *ldb,
 
 WERROR dsdb_attach_schema_from_ldif_file(struct ldb_context *ldb, const char *pf, const char *df);
 
-%feature("docstring") samba_version_string "version()\n"
-                                          "Obtain the Samba version.";
-%rename(version) samba_version_string;
-const char *samba_version_string(void);
+%feature("docstring") version "version()\n"
+                              "Obtain the Samba version.";
+
+%inline {
+const char *version(void) 
+{ 
+    return SAMBA_VERSION_STRING; 
+}
+}
 int dsdb_set_global_schema(struct ldb_context *ldb);
 %feature("docstring") ldb_register_samba_handlers "register_samba_handlers()\n"
                                           "Register Samba-specific LDB modules and schemas.";
diff --git a/source4/scripting/python/misc_wrap.c b/source4/scripting/python/misc_wrap.c
index 4b5bfb0174..3aee83f72c 100644
--- a/source4/scripting/python/misc_wrap.c
+++ b/source4/scripting/python/misc_wrap.c
@@ -2558,6 +2558,7 @@ static swig_module_info swig_module = {swig_types, 27, 0, 0, 0, 0};
 #include "dsdb/samdb/samdb.h"
 #include "lib/ldb-samba/ldif_handlers.h"
 #include "librpc/ndr/libndr.h"
+#include "version.h"
 
 
 #include "libcli/util/pyerrors.h"
@@ -2813,6 +2814,12 @@ SWIG_AsCharPtrAndSize(PyObject *obj, char** cptr, size_t* psize, int *alloc)
 
 
 
+const char *version(void) 
+{ 
+    return SAMBA_VERSION_STRING; 
+}
+
+
   #define SWIG_From_long   PyInt_FromLong 
 
 
@@ -3109,7 +3116,7 @@ SWIGINTERN PyObject *_wrap_version(PyObject *SWIGUNUSEDPARM(self), PyObject *arg
   char *result = 0 ;
   
   if (!SWIG_Python_UnpackTuple(args,"version",0,0,0)) SWIG_fail;
-  result = (char *)samba_version_string();
+  result = (char *)version();
   resultobj = SWIG_FromCharPtr((const char *)result);
   return resultobj;
 fail: