mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
db8da077ec
With the changes to make samba python code Py2/Py3 compatible there now are many instances where string content is decoded. Decoded string variables in Py2 are returned as the unicode type. Many Py2 c-module functions that take string arguments only check for the string type. However now it's quite possibe the content formally passed as a string argument is now passed as unicode after being decoded, such arguments are rejected and code can fail subtly. This only affects places where the type is directly checked e.g. via PyStr_Check etc. arguments that are parsed by ParseTuple* functions generally already accept both string and unicode (if 's', 'z', 's*' format specifiers are used) Signed-off-by: Noel Power <noel.power@suse.com> Reviewed-by: Alexander Bokovoy <ab@samba.org>
122 lines
3.0 KiB
C
122 lines
3.0 KiB
C
/*
|
|
Unix SMB/CIFS implementation.
|
|
|
|
Python interface to ldb - utility functions.
|
|
|
|
Copyright (C) 2007-2010 Jelmer Vernooij <jelmer@samba.org>
|
|
|
|
** NOTE! The following LGPL license applies to the ldb
|
|
** library. This does NOT imply that all of Samba is released
|
|
** under the LGPL
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 3 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <Python.h>
|
|
#include "ldb.h"
|
|
#include "pyldb.h"
|
|
|
|
static PyObject *ldb_module = NULL;
|
|
|
|
#if PY_MAJOR_VERSION >= 3
|
|
#define PyStr_Check PyUnicode_Check
|
|
#define PyStr_AsUTF8 PyUnicode_AsUTF8
|
|
#else
|
|
#define PyStr_Check PyString_Check
|
|
#define PyStr_AsUTF8 PyString_AsString
|
|
#endif
|
|
|
|
/**
|
|
* Find out PyTypeObject in ldb module for a given typename
|
|
*/
|
|
static PyTypeObject * PyLdb_GetPyType(const char *typename)
|
|
{
|
|
PyObject *py_obj = NULL;
|
|
|
|
if (ldb_module == NULL) {
|
|
ldb_module = PyImport_ImportModule("ldb");
|
|
if (ldb_module == NULL) {
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
py_obj = PyObject_GetAttrString(ldb_module, typename);
|
|
|
|
return (PyTypeObject*)py_obj;
|
|
}
|
|
|
|
/**
|
|
* Obtain a ldb DN from a Python object.
|
|
*
|
|
* @param mem_ctx Memory context
|
|
* @param object Python object
|
|
* @param ldb_ctx LDB context
|
|
* @return Whether or not the conversion succeeded
|
|
*/
|
|
bool pyldb_Object_AsDn(TALLOC_CTX *mem_ctx, PyObject *object,
|
|
struct ldb_context *ldb_ctx, struct ldb_dn **dn)
|
|
{
|
|
struct ldb_dn *odn;
|
|
PyTypeObject *PyLdb_Dn_Type;
|
|
|
|
if (ldb_ctx != NULL && (PyStr_Check(object) || PyUnicode_Check(object))) {
|
|
odn = ldb_dn_new(mem_ctx, ldb_ctx, PyStr_AsUTF8(object));
|
|
*dn = odn;
|
|
return true;
|
|
}
|
|
|
|
if (ldb_ctx != NULL && PyBytes_Check(object)) {
|
|
odn = ldb_dn_new(mem_ctx, ldb_ctx, PyBytes_AsString(object));
|
|
*dn = odn;
|
|
return true;
|
|
}
|
|
|
|
PyLdb_Dn_Type = PyLdb_GetPyType("Dn");
|
|
if (PyLdb_Dn_Type == NULL) {
|
|
return false;
|
|
}
|
|
|
|
if (PyObject_TypeCheck(object, PyLdb_Dn_Type)) {
|
|
*dn = pyldb_Dn_AsDn(object);
|
|
return true;
|
|
}
|
|
|
|
PyErr_SetString(PyExc_TypeError, "Expected DN");
|
|
return false;
|
|
}
|
|
|
|
PyObject *pyldb_Dn_FromDn(struct ldb_dn *dn)
|
|
{
|
|
PyLdbDnObject *py_ret;
|
|
PyTypeObject *PyLdb_Dn_Type;
|
|
|
|
if (dn == NULL) {
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyLdb_Dn_Type = PyLdb_GetPyType("Dn");
|
|
if (PyLdb_Dn_Type == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
py_ret = (PyLdbDnObject *)PyLdb_Dn_Type->tp_alloc(PyLdb_Dn_Type, 0);
|
|
if (py_ret == NULL) {
|
|
PyErr_NoMemory();
|
|
return NULL;
|
|
}
|
|
py_ret->mem_ctx = talloc_new(NULL);
|
|
py_ret->dn = talloc_reference(py_ret->mem_ctx, dn);
|
|
return (PyObject *)py_ret;
|
|
}
|