sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

pyglue: Remove unused code.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-06-19 17:19:48 +02:00
parent 74309eb29c
commit 27d82685da
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,33 +19,13 @@
#include <Python.h> #include <Python.h>
#include "includes.h" #include "includes.h"
#include "ldb.h"
#include "ldb_errors.h"
#include "ldb_wrap.h"
#include "param/param.h" #include "param/param.h"
#include "auth/credentials/credentials.h"
#include "dsdb/samdb/samdb.h"
#include "lib/ldb-samba/ldif_handlers.h"
#include "librpc/ndr/libndr.h"
#include "version.h" #include "version.h"
#include "lib/ldb/pyldb.h"
#include "libcli/util/pyerrors.h" #include "libcli/util/pyerrors.h"
#include "libcli/security/security.h"
#include "auth/pyauth.h"
#include "param/pyparam.h" #include "param/pyparam.h"
#include "auth/credentials/pycredentials.h"
#include "lib/socket/netif.h" #include "lib/socket/netif.h"
#include "lib/socket/netif_proto.h" #include "lib/socket/netif_proto.h"
/* FIXME: These should be in a header file somewhere, once we finish moving
* away from SWIG .. */
#define PyErr_LDB_OR_RAISE(py_ldb, ldb) \
/* if (!PyLdb_Check(py_ldb)) { \
PyErr_SetString(py_ldb_get_exception(), "Ldb connection object required"); \
return NULL; \
} */\
ldb = PyLdb_AsLdbContext(py_ldb);
static PyObject *py_generate_random_str(PyObject *self, PyObject *args) static PyObject *py_generate_random_str(PyObject *self, PyObject *args)
{ {
int len; int len;
@ -189,8 +169,8 @@ static PyMethodDef py_misc_methods[] = {
{ "generate_random_str", (PyCFunction)py_generate_random_str, METH_VARARGS, { "generate_random_str", (PyCFunction)py_generate_random_str, METH_VARARGS,
"generate_random_str(len) -> string\n" "generate_random_str(len) -> string\n"
"Generate random string with specified length." }, "Generate random string with specified length." },
{ "generate_random_password", (PyCFunction)py_generate_random_password, METH_VARARGS, { "generate_random_password", (PyCFunction)py_generate_random_password,
"generate_random_password(min, max) -> string\n" METH_VARARGS, "generate_random_password(min, max) -> string\n"
"Generate random password with a length >= min and <= max." }, "Generate random password with a length >= min and <= max." },
{ "unix2nttime", (PyCFunction)py_unix2nttime, METH_VARARGS, { "unix2nttime", (PyCFunction)py_unix2nttime, METH_VARARGS,
"unix2nttime(timestamp) -> nttime" }, "unix2nttime(timestamp) -> nttime" },
@ -216,15 +196,13 @@ void init_glue(void)
if (m == NULL) if (m == NULL)
return; return;
PyModule_AddObject(m, "version", PyString_FromString(SAMBA_VERSION_STRING)); PyModule_AddObject(m, "version",
PyString_FromString(SAMBA_VERSION_STRING));
/* one of the most annoying things about python scripts is /* one of the most annoying things about python scripts is
that they don't die when you hit control-C. This fixes that that they don't die when you hit control-C. This fixes that
sillyness. As we do all database operations using sillyness. As we do all database operations using
transactions, this is also safe. In fact, not dying transactions, this is also safe.
immediately is unsafe as we could end up treating the
control-C exception as a different error and try to modify
as database incorrectly
*/ */
signal(SIGINT, SIG_DFL); signal(SIGINT, SIG_DFL);
} }