summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/auth/pyauth.c1
-rw-r--r--source4/lib/ldb/tools/cmdline.c2
-rw-r--r--source4/lib/stream/packet.h1
-rw-r--r--source4/param/provision.c2
-rw-r--r--source4/torture/rpc/samba3rpc.c1
-rw-r--r--source4/torture/smb2/acls.c4
6 files changed, 7 insertions, 4 deletions
diff --git a/source4/auth/pyauth.c b/source4/auth/pyauth.c
index 7ec7f3e7f2..865609e8e3 100644
--- a/source4/auth/pyauth.c
+++ b/source4/auth/pyauth.c
@@ -16,6 +16,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <Python.h>
#include "includes.h"
#include "param/param.h"
#include "pyauth.h"
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c
index 44ae23b26c..f2becb17af 100644
--- a/source4/lib/ldb/tools/cmdline.c
+++ b/source4/lib/ldb/tools/cmdline.c
@@ -33,6 +33,8 @@
#include "auth/auth.h"
#include "ldb_wrap.h"
#include "param/param.h"
+#include "librpc/gen_ndr/drsblobs.h"
+#include "dsdb/schema/schema.h"
#include "dsdb/common/proto.h"
#endif
diff --git a/source4/lib/stream/packet.h b/source4/lib/stream/packet.h
index 85f0f26265..a274bd397c 100644
--- a/source4/lib/stream/packet.h
+++ b/source4/lib/stream/packet.h
@@ -23,6 +23,7 @@
struct packet_context;
struct tevent_context;
struct tevent_fd;
+struct socket_context;
typedef NTSTATUS (*packet_full_request_fn_t)(void *private_data,
DATA_BLOB blob, size_t *packet_size);
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 7bd10ca522..920a5d8639 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -68,7 +68,7 @@ static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
if (ldb_mod == NULL)
return NULL;
- ldb_ctx_type = PyObject_GetAttrString(ldb_mod, "Ldb");
+ ldb_ctx_type = (PyTypeObject *)PyObject_GetAttrString(ldb_mod, "Ldb");
ret = (PyLdbObject *)ldb_ctx_type->tp_alloc(ldb_ctx_type, 0);
if (ret == NULL) {
diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c
index 7cae8db344..86f41b058b 100644
--- a/source4/torture/rpc/samba3rpc.c
+++ b/source4/torture/rpc/samba3rpc.c
@@ -3551,7 +3551,6 @@ bool torture_samba3_getaliasmembership_0(struct torture_context *torture)
{
struct dcerpc_pipe *p;
NTSTATUS status;
- bool ret;
struct samr_Connect2 c;
struct samr_OpenDomain o;
struct dom_sid sid;
diff --git a/source4/torture/smb2/acls.c b/source4/torture/smb2/acls.c
index c746d96110..8177a1ab2e 100644
--- a/source4/torture/smb2/acls.c
+++ b/source4/torture/smb2/acls.c
@@ -47,13 +47,13 @@
status = smb2_getinfo_file(tree, tctx, &_q); \
CHECK_STATUS(status, NT_STATUS_OK); \
/* Handle a Vista bug where SEC_STD_SYNCHRONIZE doesn't come back. */ \
- if (((flags & CHECK_ACCESS_IGNORE) == CHECK_ACCESS_IGNORE) && \
+ if ((((flags) & CHECK_ACCESS_IGNORE) == CHECK_ACCESS_IGNORE) && \
((_q.access_information.out.access_flags & CHECK_ACCESS_IGNORE) != CHECK_ACCESS_IGNORE)) { \
torture_comment(tctx, "SKIPPING (Vista bug): (%s) Incorrect access_flags 0x%08x - should be 0x%08x\n", \
__location__, _q.access_information.out.access_flags, (flags)); \
} \
if ((_q.access_information.out.access_flags & ~CHECK_ACCESS_IGNORE) != \
- ((flags & ~CHECK_ACCESS_IGNORE))) { \
+ (((flags) & ~CHECK_ACCESS_IGNORE))) { \
torture_result(tctx, TORTURE_FAIL, "(%s) Incorrect access_flags 0x%08x - should be 0x%08x\n", \
__location__, _q.access_information.out.access_flags, (flags)); \
ret = false; \