diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-09-04 11:32:32 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-09-04 11:32:32 +1000 |
| commit | b533a1f4bf62c7983f612927499f60b503322c4d (patch) | |
| tree | 82bb0bd315ce7afcd1963d4dcd7aaf727257fda8 /source4/scripting/python/misc.i | |
| parent | b936d0f3bed9d6ab42803f71cb02c929acf7e518 (diff) | |
| parent | fbbe799e4e68d79846614c6648307cc6b3f76906 (diff) | |
| download | samba-b533a1f4bf62c7983f612927499f60b503322c4d.tar.gz samba-b533a1f4bf62c7983f612927499f60b503322c4d.tar.xz samba-b533a1f4bf62c7983f612927499f60b503322c4d.zip | |
Merge commit 'origin/v4-0-test' into trusted-domains
(This used to be commit b599b83a13db90b50a5422ff73daa63648b1e8cd)
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 1d331215b5..19318cdb17 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."; |