sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

allow setting of the debug level in python from C

Browse Source
This commit is contained in:
Andrew Tridgell 2009-09-03 13:03:31 +10:00
parent 348824da75
commit 617bbd913d
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source4/param/provision.c
View File

@ -34,7 +34,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
struct provision_settings *settings,
struct provision_result *result)
{
char *configfile;
const char *configfile;
PyObject *provision_mod, *provision_dict, *provision_fn, *py_result, *parameters;
DEBUG(0,("Provision for Become-DC test using python\n"));
@ -123,6 +123,9 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
PyDict_SetItemString(parameters, "machinepass",
PyString_FromString(settings->machine_password));
PyDict_SetItemString(parameters, "debuglevel", PyInt_FromLong(DEBUGLEVEL));
py_result = PyEval_CallObjectWithKeywords(provision_fn, NULL, parameters);
Py_DECREF(parameters);

11
source4/scripting/python/pyglue.c
View File

@ -93,6 +93,15 @@ static PyObject *py_unix2nttime(PyObject *self, PyObject *args)
return PyInt_FromLong((uint64_t)nt);
}
static PyObject *py_set_debug_level(PyObject *self, PyObject *args)
{
unsigned level;
if (!PyArg_ParseTuple(args, "I", &level))
return NULL;
(DEBUGLEVEL) = level;
Py_RETURN_NONE;
}
static PyObject *py_ldb_set_credentials(PyObject *self, PyObject *args)
{
PyObject *py_creds, *py_ldb;
@ -483,6 +492,8 @@ static PyMethodDef py_misc_methods[] = {
NULL },
{ "dom_sid_to_rid", (PyCFunction)py_dom_sid_to_rid, METH_VARARGS,
NULL },
{ "set_debug_level", (PyCFunction)py_set_debug_level, METH_VARARGS,
"set debug level" },
{ NULL }
};

4
source4/scripting/python/samba/provision.py
View File

@ -1298,12 +1298,14 @@ def provision_become_dc(setup_dir=None,
policyguid=None, invocationid=None, machinepass=None,
dnspass=None, root=None, nobody=None, users=None,
wheel=None, backup=None, serverrole=None,
ldap_backend=None, ldap_backend_type=None, sitename=None):
ldap_backend=None, ldap_backend_type=None, sitename=None, debuglevel=1):
def message(text):
"""print a message if quiet is not set."""
print text
glue.set_debug_level(debuglevel)
return provision(setup_dir, message, system_session(), None,
smbconf=smbconf, targetdir=targetdir, samdb_fill=FILL_DRS, realm=realm,
rootdn=rootdn, domaindn=domaindn, schemadn=schemadn, configdn=configdn, serverdn=serverdn,