sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

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

Browse Source 
(This used to be commit c273d63f94)
This commit is contained in:
Andrew Tridgell
2008-09-04 12:49:29 +10:00
parent e82f218732 fbbe799e4e
commit 1929b2fb51
16 changed files with 474 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source4/scripting/python/misc.i
View File

@ -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.";

9
source4/scripting/python/misc_wrap.c
View File

@ -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: