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

Use python.h from libreplace

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15513

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2023-11-09 11:35:56 +01:00 committed by Andreas Schneider
parent f337fd9950
commit 9621a3d7a6
53 changed files with 53 additions and 53 deletions

View File

@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -26,7 +26,7 @@
#include "includes.h" #include "includes.h"
#include <talloc.h> #include <talloc.h>
#include <Python.h> #include "lib/replace/system/python.h"
#include "lzxpress.h" #include "lzxpress.h"
#include "lzxpress_huffman.h" #include "lzxpress_huffman.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -19,7 +19,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include <ldb.h> #include <ldb.h>

View File

@ -28,7 +28,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "ldb_private.h" #include "ldb_private.h"
#include "ldb_handlers.h" #include "ldb_handlers.h"
#include "pyldb.h" #include "pyldb.h"

View File

@ -23,7 +23,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "ldb.h" #include "ldb.h"
#include "pyldb.h" #include "pyldb.h"

View File

@ -18,7 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -21,7 +21,7 @@
#ifndef _PYSMBCONF_H_ #ifndef _PYSMBCONF_H_
#define _PYSMBCONF_H_ #define _PYSMBCONF_H_
#include <Python.h> #include "lib/replace/system/python.h"
#include "lib/smbconf/smbconf.h" #include "lib/smbconf/smbconf.h"
typedef struct { typedef struct {

View File

@ -21,7 +21,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include <talloc.h> #include <talloc.h>
#include <pytalloc.h> #include <pytalloc.h>
#include "pytalloc_private.h" #include "pytalloc_private.h"

View File

@ -21,7 +21,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "replace.h" #include "replace.h"
#include <talloc.h> #include <talloc.h>
#include "pytalloc.h" #include "pytalloc.h"

View File

@ -26,7 +26,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include <talloc.h> #include <talloc.h>
#include <pytalloc.h> #include <pytalloc.h>

View File

@ -24,7 +24,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "replace.h" #include "replace.h"
#include "system/filesys.h" #include "system/filesys.h"

View File

@ -22,7 +22,7 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>. License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "replace.h" #include "replace.h"
#include <tevent.h> #include <tevent.h>

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "libcli/util/pyerrors.h" #include "libcli/util/pyerrors.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "replace.h" #include "replace.h"
#include "python/modules.h" #include "python/modules.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "version.h" #include "version.h"
#include "param/pyparam.h" #include "param/pyparam.h"

View File

@ -2292,7 +2292,7 @@ sub Parse($$$$$)
$self->pidl_hdr(" $self->pidl_hdr("
/* Python wrapper functions auto-generated by pidl */ /* Python wrapper functions auto-generated by pidl */
#define PY_SSIZE_T_CLEAN 1 /* We use Py_ssize_t for PyArg_ParseTupleAndKeywords */ #define PY_SSIZE_T_CLEAN 1 /* We use Py_ssize_t for PyArg_ParseTupleAndKeywords */
#include <Python.h> #include \"lib/replace/system/python.h\"
#include \"python/py3compat.h\" #include \"python/py3compat.h\"
#include \"includes.h\" #include \"includes.h\"
#include \"python/modules.h\" #include \"python/modules.h\"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "py3compat.h" #include "py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -19,7 +19,7 @@
#ifndef _SAMBA_PY3COMPAT_H_ #ifndef _SAMBA_PY3COMPAT_H_
#define _SAMBA_PY3COMPAT_H_ #define _SAMBA_PY3COMPAT_H_
#include <Python.h> #include "lib/replace/system/python.h"
/* Quick docs: /* Quick docs:
* Syntax for module initialization is as in Python 3, except the entrypoint * Syntax for module initialization is as in Python 3, except the entrypoint

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -18,7 +18,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -45,7 +45,7 @@ c = libsmb.Conn("127.0.0.1",
------------------------- -------------------------
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "param/param.h" #include "param/param.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "param/param.h" #include "param/param.h"
#include "param/pyparam.h" #include "param/pyparam.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include <pytalloc.h> #include <pytalloc.h>
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include <pytalloc.h> #include <pytalloc.h>
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"

View File

@ -23,7 +23,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include <pytalloc.h> #include <pytalloc.h>
#include "python/modules.h" #include "python/modules.h"

View File

@ -16,7 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include <ldb.h> #include <ldb.h>

View File

@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -17,7 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "policy.h" #include "policy.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -19,7 +19,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "includes.h" #include "includes.h"
#include "libcli/util/pyerrors.h" #include "libcli/util/pyerrors.h"
#include "pyauth.h" #include "pyauth.h"

View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "librpc/gen_ndr/lsa.h" #include "librpc/gen_ndr/lsa.h"
static PyObject *py_lsa_String_str(PyObject *py_self) static PyObject *py_lsa_String_str(PyObject *py_self)

View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "librpc/gen_ndr/misc.h" #include "librpc/gen_ndr/misc.h"

View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "gen_ndr/conditional_ace.h" #include "gen_ndr/conditional_ace.h"
#include "py3compat.h" #include "py3compat.h"
#include "libcli/security/sddl.h" #include "libcli/security/sddl.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods) static void PyType_AddMethods(PyTypeObject *type, PyMethodDef *methods)
{ {

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -20,7 +20,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "python/modules.h" #include "python/modules.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "system/filesys.h" #include "system/filesys.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "librpc/ndr/libndr.h" #include "librpc/ndr/libndr.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "system/filesys.h" #include "system/filesys.h"

View File

@ -18,7 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include <ldb.h> #include <ldb.h>
#include <pyldb.h> #include <pyldb.h>

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "python/py3compat.h" #include "python/py3compat.h"
#include "includes.h" #include "includes.h"
#include "param/param.h" #include "param/param.h"

View File

@ -17,7 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <Python.h> #include "lib/replace/system/python.h"
#include "py3compat.h" #include "py3compat.h"
#include "includes.h" #include "includes.h"
#include "param/param.h" #include "param/param.h"

View File

@ -69,7 +69,7 @@ def generatePythonFile(out_file, errors):
out_file.write(" * New descriptions for existing errors generated from\n") out_file.write(" * New descriptions for existing errors generated from\n")
out_file.write(" * [MS-ERREF] http://msdn.microsoft.com/en-us/library/cc704588.aspx\n") out_file.write(" * [MS-ERREF] http://msdn.microsoft.com/en-us/library/cc704588.aspx\n")
out_file.write(" */\n") out_file.write(" */\n")
out_file.write("#include <Python.h>\n") out_file.write("#include \"lib/replace/system/python.h\"\n")
out_file.write("#include \"python/py3compat.h\"\n") out_file.write("#include \"python/py3compat.h\"\n")
out_file.write("#include \"includes.h\"\n\n") out_file.write("#include \"includes.h\"\n\n")
# This is needed to avoid a missing prototype error from the C # This is needed to avoid a missing prototype error from the C

View File

@ -67,7 +67,7 @@ def generatePythonFile(out_file, errors):
out_file.write(" * Errors generated from\n") out_file.write(" * Errors generated from\n")
out_file.write(" * [MS-ERREF] https://msdn.microsoft.com/en-us/library/cc231199.aspx\n") out_file.write(" * [MS-ERREF] https://msdn.microsoft.com/en-us/library/cc231199.aspx\n")
out_file.write(" */\n") out_file.write(" */\n")
out_file.write("#include <Python.h>\n") out_file.write("#include \"lib/replace/system/python.h\"\n")
out_file.write("#include \"python/py3compat.h\"\n") out_file.write("#include \"python/py3compat.h\"\n")
out_file.write("#include \"includes.h\"\n\n") out_file.write("#include \"includes.h\"\n\n")
# This is needed to avoid a missing prototype error from the C # This is needed to avoid a missing prototype error from the C