The branch, master has been updated via db63e48 vfs: Fix a typo via 0298026 Remove use of the "staticforward" macro from 496b67b dsdb-tests: Clarify that accounts really do fall back to UF_NORMAL_ACCOUNT if no account set
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit db63e4887c81c3e458194004353d7ef92c67b393 Author: Volker Lendecke <v...@samba.org> Date: Wed Jan 21 20:49:24 2015 +0100 vfs: Fix a typo Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Jan 22 13:14:38 CET 2015 on sn-devel-104 commit 02980268e8641a1558c6f475d4669ce4d663504d Author: Petr Viktorin <pvikt...@redhat.com> Date: Wed Dec 3 13:59:58 2014 +0100 Remove use of the "staticforward" macro This macro was used for compatibility with broken compilers. Since Python 2.3, it is always defined as `static`, and only exists "for source compatibility with old C extensions". Signed-off-by: Petr Viktorin <pvikt...@redhat.com> Reviewed-by: Jelmer Vernooij <jel...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> ----------------------------------------------------------------------- Summary of changes: lib/ldb-samba/pyldb.c | 2 +- lib/ldb/pyldb.c | 14 +++++++------- lib/ntdb/pyntdb.c | 2 +- lib/tevent/pytevent.c | 12 ++++++------ pidl/lib/Parse/Pidl/Samba4/Python.pm | 4 ++-- source3/modules/vfs_glusterfs.c | 2 +- source3/passdb/py_passdb.c | 6 +++--- source4/libcli/pysmb.c | 2 +- source4/librpc/rpc/pyrpc.c | 2 +- 9 files changed, 23 insertions(+), 23 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/ldb-samba/pyldb.c b/lib/ldb-samba/pyldb.c index aae25a0..6c0d2a7 100644 --- a/lib/ldb-samba/pyldb.c +++ b/lib/ldb-samba/pyldb.c @@ -33,7 +33,7 @@ void init_ldb(void); static PyObject *pyldb_module; static PyObject *py_ldb_error; -staticforward PyTypeObject PySambaLdb; +static PyTypeObject PySambaLdb; static void PyErr_SetLdbError(PyObject *error, int ret, struct ldb_context *ldb_ctx) { diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c index ee751b3..5bcff72 100644 --- a/lib/ldb/pyldb.c +++ b/lib/ldb/pyldb.c @@ -36,16 +36,16 @@ void initldb(void); static PyObject *PyLdbMessage_FromMessage(struct ldb_message *msg); static PyObject *PyExc_LdbError; -staticforward PyTypeObject PyLdbControl; -staticforward PyTypeObject PyLdbResult; -staticforward PyTypeObject PyLdbMessage; +static PyTypeObject PyLdbControl; +static PyTypeObject PyLdbResult; +static PyTypeObject PyLdbMessage; #define PyLdbMessage_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessage) -staticforward PyTypeObject PyLdbModule; -staticforward PyTypeObject PyLdbDn; +static PyTypeObject PyLdbModule; +static PyTypeObject PyLdbDn; #define pyldb_Dn_Check(ob) PyObject_TypeCheck(ob, &PyLdbDn) -staticforward PyTypeObject PyLdb; +static PyTypeObject PyLdb; #define PyLdb_Check(ob) PyObject_TypeCheck(ob, &PyLdb) -staticforward PyTypeObject PyLdbMessageElement; +static PyTypeObject PyLdbMessageElement; #define pyldb_MessageElement_Check(ob) PyObject_TypeCheck(ob, &PyLdbMessageElement) staticforward PyTypeObject PyLdbTree; diff --git a/lib/ntdb/pyntdb.c b/lib/ntdb/pyntdb.c index b2a1f0c..72e6264 100644 --- a/lib/ntdb/pyntdb.c +++ b/lib/ntdb/pyntdb.c @@ -38,7 +38,7 @@ typedef struct { bool closed; } PyNtdbObject; -staticforward PyTypeObject PyNtdb; +static PyTypeObject PyNtdb; static void PyErr_SetTDBError(enum NTDB_ERROR e) { diff --git a/lib/tevent/pytevent.c b/lib/tevent/pytevent.c index 870f5aa..af3f9d6 100644 --- a/lib/tevent/pytevent.c +++ b/lib/tevent/pytevent.c @@ -57,12 +57,12 @@ typedef struct { struct tevent_fd *fd; } TeventFd_Object; -staticforward PyTypeObject TeventContext_Type; -staticforward PyTypeObject TeventReq_Type; -staticforward PyTypeObject TeventQueue_Type; -staticforward PyTypeObject TeventSignal_Type; -staticforward PyTypeObject TeventTimer_Type; -staticforward PyTypeObject TeventFd_Type; +static PyTypeObject TeventContext_Type; +static PyTypeObject TeventReq_Type; +static PyTypeObject TeventQueue_Type; +static PyTypeObject TeventSignal_Type; +static PyTypeObject TeventTimer_Type; +static PyTypeObject TeventFd_Type; static int py_context_init(struct tevent_context *ev) { diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm index 31cf63f..920d10a 100644 --- a/pidl/lib/Parse/Pidl/Samba4/Python.pm +++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm @@ -355,7 +355,7 @@ sub PythonStruct($$$$$$) $self->pidl(""); } - $self->pidl_hdr("staticforward PyTypeObject $name\_Type;\n"); + $self->pidl_hdr("static PyTypeObject $name\_Type;\n"); $self->pidl(""); my $docstring = $self->DocString($d, $name); my $typeobject = "$name\_Type"; @@ -691,7 +691,7 @@ sub Interface($$$) } if (defined $interface->{PROPERTIES}->{uuid}) { - $self->pidl_hdr("staticforward PyTypeObject $interface->{NAME}_InterfaceType;\n"); + $self->pidl_hdr("static PyTypeObject $interface->{NAME}_InterfaceType;\n"); $self->pidl(""); my @fns = (); diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c index 40e4b74..04314f2 100644 --- a/source3/modules/vfs_glusterfs.c +++ b/source3/modules/vfs_glusterfs.c @@ -496,7 +496,7 @@ struct glusterfs_aio_state { /* * This function is the callback that will be called on glusterfs * threads once the async IO submitted is complete. To notify - * Samba of the completion we use a pipe pased queue. + * Samba of the completion we use a pipe based queue. */ static void aio_glusterfs_done(glfs_fd_t *fd, ssize_t ret, void *data) { diff --git a/source3/passdb/py_passdb.c b/source3/passdb/py_passdb.c index 3a1e583..07540cd 100644 --- a/source3/passdb/py_passdb.c +++ b/source3/passdb/py_passdb.c @@ -51,9 +51,9 @@ static PyTypeObject *dom_sid_Type = NULL; static PyTypeObject *security_Type = NULL; static PyTypeObject *guid_Type = NULL; -staticforward PyTypeObject PySamu; -staticforward PyTypeObject PyGroupmap; -staticforward PyTypeObject PyPDB; +static PyTypeObject PySamu; +static PyTypeObject PyGroupmap; +static PyTypeObject PyPDB; static PyObject *py_pdb_error; diff --git a/source4/libcli/pysmb.c b/source4/libcli/pysmb.c index 456b01d..dde37e0 100644 --- a/source4/libcli/pysmb.c +++ b/source4/libcli/pysmb.c @@ -38,7 +38,7 @@ #include "libcli/security/security_descriptor.h" #include "librpc/rpc/pyrpc_util.h" -staticforward PyTypeObject PySMB; +static PyTypeObject PySMB; void initsmb(void); diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c index 360fb24..09f6632 100644 --- a/source4/librpc/rpc/pyrpc.c +++ b/source4/librpc/rpc/pyrpc.c @@ -30,7 +30,7 @@ void initbase(void); -staticforward PyTypeObject dcerpc_InterfaceType; +static PyTypeObject dcerpc_InterfaceType; static PyTypeObject *ndr_syntax_id_Type; -- Samba Shared Repository