diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-09-04 12:49:29 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-09-04 12:49:29 +1000 |
commit | 1929b2fb5106495fa3d155037e123dc920c6697b (patch) | |
tree | 33d3d8c7d5daa31e8a58c6d66e74a56f9f2bdb24 /source4/scripting/python/misc.i | |
parent | e82f2187325274d728ec7470990f971e7b3db13c (diff) | |
parent | fbbe799e4e68d79846614c6648307cc6b3f76906 (diff) | |
download | samba-1929b2fb5106495fa3d155037e123dc920c6697b.tar.gz samba-1929b2fb5106495fa3d155037e123dc920c6697b.tar.bz2 samba-1929b2fb5106495fa3d155037e123dc920c6697b.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit c273d63f94c430a4f553085efb0d6e31a99e5853)
Diffstat (limited to 'source4/scripting/python/misc.i')
-rw-r--r-- | source4/scripting/python/misc.i | 14 |
1 files changed, 10 insertions, 4 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."; |