summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/librpc/rpc/dcerpc.h3
-rw-r--r--source3/modules/vfs_hpuxacl.c1
-rw-r--r--source3/smbd/filename_util.c2
-rw-r--r--source3/winbindd/winbindd_remove_mapping.c2
-rw-r--r--source3/winbindd/winbindd_set_hwm.c2
-rw-r--r--source3/winbindd/winbindd_set_mapping.c2
6 files changed, 8 insertions, 4 deletions
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 48019a421d..8da56e2aaf 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -119,5 +119,8 @@ struct dcerpc_binding {
/* this triggers the DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN flag in the bind request */
#define DCERPC_HEADER_SIGNING (1<<20)
+/* use NDR64 transport */
+#define DCERPC_NDR64 (1<<21)
+
#endif /* __DCERPC_H__ */
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index abc80dcd9c..df70f1ea08 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -216,6 +216,7 @@ int hpuxacl_sys_acl_set_file(vfs_handle_struct *handle,
HPUX_ACL_T hpux_acl = NULL;
int count;
struct smb_filename *smb_fname = NULL;
+ NTSTATUS status;
DEBUG(10, ("hpuxacl_sys_acl_set_file called for file '%s'\n",
name));
diff --git a/source3/smbd/filename_util.c b/source3/smbd/filename_util.c
index 867709a373..8c099657c4 100644
--- a/source3/smbd/filename_util.c
+++ b/source3/smbd/filename_util.c
@@ -190,7 +190,7 @@ bool is_ntfs_stream_smb_fname(const struct smb_filename *smb_fname)
return false;
}
- return smb_fname->stream_name;
+ return smb_fname->stream_name != NULL;
}
/****************************************************************************
diff --git a/source3/winbindd/winbindd_remove_mapping.c b/source3/winbindd/winbindd_remove_mapping.c
index 055694d63c..1ca4e9452f 100644
--- a/source3/winbindd/winbindd_remove_mapping.c
+++ b/source3/winbindd/winbindd_remove_mapping.c
@@ -35,7 +35,7 @@ struct tevent_req *winbindd_remove_mapping_send(TALLOC_CTX *mem_ctx,
struct tevent_req *req, *subreq;
struct winbindd_remove_mapping_state *state;
struct winbindd_child *child;
- enum id_type type;
+ enum wbint_IdType type;
req = tevent_req_create(mem_ctx, &state,
struct winbindd_remove_mapping_state);
diff --git a/source3/winbindd/winbindd_set_hwm.c b/source3/winbindd/winbindd_set_hwm.c
index 4446ae22f0..11f1b5012d 100644
--- a/source3/winbindd/winbindd_set_hwm.c
+++ b/source3/winbindd/winbindd_set_hwm.c
@@ -35,7 +35,7 @@ struct tevent_req *winbindd_set_hwm_send(TALLOC_CTX *mem_ctx,
struct tevent_req *req, *subreq;
struct winbindd_set_hwm_state *state;
struct winbindd_child *child;
- enum id_type type;
+ enum wbint_IdType type;
req = tevent_req_create(mem_ctx, &state,
struct winbindd_set_hwm_state);
diff --git a/source3/winbindd/winbindd_set_mapping.c b/source3/winbindd/winbindd_set_mapping.c
index 8274c1eb10..7ca564a559 100644
--- a/source3/winbindd/winbindd_set_mapping.c
+++ b/source3/winbindd/winbindd_set_mapping.c
@@ -35,7 +35,7 @@ struct tevent_req *winbindd_set_mapping_send(TALLOC_CTX *mem_ctx,
struct tevent_req *req, *subreq;
struct winbindd_set_mapping_state *state;
struct winbindd_child *child;
- enum id_type type;
+ enum wbint_IdType type;
req = tevent_req_create(mem_ctx, &state,
struct winbindd_set_mapping_state);