The branch, master has been updated
via e1335efa161 libcli: Remove define STATUS_EA_LIST_INCONSISTENT
via b467f86a4ac libcli: Remove define STATUS_STOPPED_ON_SYMLINK
via 1dbb2752c98 libcli: Remove define for STATUS_PENDING
via 7bd08bed16e smbd: Use NT_STATUS_PENDING instead of STATUS_PENDING
via 315271f81fc source4/smb_server: Use NT_STATUS_PENDING instead of
STATUS_PENDING
via 7fe581874ac source4/libcli: Use NT_STATUS_PENDING instead of
STATUS_PENDING
via 0a877e9b475 smbtorture: Use NT_STATUS_PENDING instead of
STATUS_PENDING
via 37a51b105b7 libcli: Use NT_STATUS_PENDING instead of STATUS_PENDING
via 6c2b1981da5 libcli: Remove define for STATUS_NOTIFY_ENUM_DIR
via 73d452305fc ntvfs: Use NT_STATUS_NOTIFY_ENUM_DIR instead of
STATUS_NOTIFY_ENUM_DIR
via eec333daf48 smbtorture: Use NT_STATUS_NOTIFY_ENUM_DIR instead of
STATUS_NOTIFY_ENUM_DIR
via 3c90253a1e1 smbclient: Use NT_STATUS_NOTIFY_ENUM_DIR instead of
STATUS_NOTIFY_ENUM_DIR
via 0b72c411895 smbd: Use NT_STATUS_NOTIFY_ENUM_DIR instead of
STATUS_NOTIFY_ENUM_DIR
via d5f29c0765a libcli: Remove define for STATUS_NOTIFY_CLEANUP
via 85380ab9dab torture: Use NT_STATUS_NOTIFY_CLEANUP instead of
STATUS_NOTIFY_CLEANUP
via fb7ac0816a5 smbd: Use NT_STATUS_NOTIFY_CLEANUP instead of
STATUS_NOTIFY_CLEANUP
via b7062251bc2 libcli: Remove define for STATUS_INVALID_EA_FLAG
via 172ae564ce8 libcli: Remove define STATUS_NO_MORE_EAS
via e4e65d0268d libcli: Remove define for ERROR_INVALID_DATATYPE
from f9dd67355ba Fix usage of ldap_get_values_len for
msDS-AdditionalDnsHostName
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e1335efa161c37a39ac93fd9a1a514f1a331f030
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 13:07:39 2020 -0700
libcli: Remove define STATUS_EA_LIST_INCONSISTENT
The auto-generated define NT_STATUS_EA_LIST_INCONSISTENT is still
available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Mon Jun 22 13:30:51 UTC 2020 on sn-devel-184
commit b467f86a4ac6fc077e2154faabc950e323fa3b9f
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 13:06:08 2020 -0700
libcli: Remove define STATUS_STOPPED_ON_SYMLINK
The auto-generated define NT_STATUS_STOPPED_ON_SYMLINK is still
available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 1dbb2752c98fd45b00173f9d54c0d6b47fb4e760
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 13:03:18 2020 -0700
libcli: Remove define for STATUS_PENDING
The auto-generated define NT_STATUS_PENDING is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 7bd08bed16e7bf527b12f061b64726a8e52d5031
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 13:00:23 2020 -0700
smbd: Use NT_STATUS_PENDING instead of STATUS_PENDING
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 315271f81fc02578f0d673105f96040cc69030cf
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:59:12 2020 -0700
source4/smb_server: Use NT_STATUS_PENDING instead of STATUS_PENDING
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 7fe581874ac47394d94dd4410b59356a979c6875
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:58:04 2020 -0700
source4/libcli: Use NT_STATUS_PENDING instead of STATUS_PENDING
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 0a877e9b475c7f696c6bbd556745ad1fe209903d
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:56:56 2020 -0700
smbtorture: Use NT_STATUS_PENDING instead of STATUS_PENDING
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 37a51b105b7c5cd50cadd12c19eb99867badc41e
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:55:13 2020 -0700
libcli: Use NT_STATUS_PENDING instead of STATUS_PENDING
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 6c2b1981da5b5426a5a59b5d6c50f69e9aab9e6f
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:54:16 2020 -0700
libcli: Remove define for STATUS_NOTIFY_ENUM_DIR
The auto-generated define NT_STATUS_NOTIFY_ENUM_DIR is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 73d452305fcc59b0f54bf023d22e142d8f096d22
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:47:06 2020 -0700
ntvfs: Use NT_STATUS_NOTIFY_ENUM_DIR instead of STATUS_NOTIFY_ENUM_DIR
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit eec333daf481b903a578be75cef62f57ba73c082
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:45:36 2020 -0700
smbtorture: Use NT_STATUS_NOTIFY_ENUM_DIR instead of STATUS_NOTIFY_ENUM_DIR
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 3c90253a1e1626e23321ef9fc200b68fb6dbdebb
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:43:54 2020 -0700
smbclient: Use NT_STATUS_NOTIFY_ENUM_DIR instead of STATUS_NOTIFY_ENUM_DIR
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 0b72c41189593f794b48d9119460fde0741a1174
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:42:50 2020 -0700
smbd: Use NT_STATUS_NOTIFY_ENUM_DIR instead of STATUS_NOTIFY_ENUM_DIR
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit d5f29c0765ace8c0192e6c39f2565ed35615732d
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:41:33 2020 -0700
libcli: Remove define for STATUS_NOTIFY_CLEANUP
The auto-generated NT_STATUS_NOTIFY_CLEANUP is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 85380ab9dab442b6a902aa10f3b004af41bd8ce8
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:39:22 2020 -0700
torture: Use NT_STATUS_NOTIFY_CLEANUP instead of STATUS_NOTIFY_CLEANUP
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit fb7ac0816a5f92b172ad6344c4faee3fe59cd997
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:38:59 2020 -0700
smbd: Use NT_STATUS_NOTIFY_CLEANUP instead of STATUS_NOTIFY_CLEANUP
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit b7062251bc2c299e2c5794873dbc91af5163b29a
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:33:29 2020 -0700
libcli: Remove define for STATUS_INVALID_EA_FLAG
The auto-generated define NT_STATUS_INVALID_EA_FLAG is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit 172ae564ce85a798048cc27d806bc8d7e6779d79
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:28:55 2020 -0700
libcli: Remove define STATUS_NO_MORE_EAS
The auto-generated define NT_STATUS_NO_MORE_EAS is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
commit e4e65d0268df30c36337cbf0ae07febfc9213ffe
Author: Christof Schmitt <c...@samba.org>
Date: Fri Jun 19 12:19:03 2020 -0700
libcli: Remove define for ERROR_INVALID_DATATYPE
The auto-generated define WERR_INVALID_DATATYPE is still available.
Signed-off-by: Christof Schmitt <c...@samba.org>
Reviewed-by: Gary Lockyer <g...@catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smbXcli_base.c | 6 +++---
libcli/util/nterr.c | 6 ------
libcli/util/ntstatus.h | 8 --------
source3/client/client.c | 2 +-
source3/smbd/close.c | 2 +-
source3/smbd/notify.c | 6 +++---
source3/smbd/smb2_notify.c | 2 +-
source3/smbd/smb2_server.c | 2 +-
source4/libcli/smb2/transport.c | 2 +-
source4/ntvfs/ntvfs_generic.c | 2 +-
source4/smb_server/smb2/receive.c | 2 +-
source4/torture/smb2/notify.c | 22 +++++++++++-----------
12 files changed, 24 insertions(+), 38 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 3e5bee92ed1..7d2da4b9ebc 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -3735,7 +3735,7 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct
smbXcli_conn *conn,
status = NT_STATUS(IVAL(inhdr, SMB2_HDR_STATUS));
if ((flags & SMB2_HDR_FLAG_ASYNC) &&
- NT_STATUS_EQUAL(status, STATUS_PENDING)) {
+ NT_STATUS_EQUAL(status, NT_STATUS_PENDING)) {
uint64_t async_id = BVAL(inhdr, SMB2_HDR_ASYNC_ID);
if (state->smb2.got_async) {
@@ -4006,7 +4006,7 @@ NTSTATUS smb2cli_req_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
}
if (tevent_req_is_in_progress(req) && state->smb2.got_async) {
- return STATUS_PENDING;
+ return NT_STATUS_PENDING;
}
if (tevent_req_is_nterror(req, &status)) {
@@ -4076,7 +4076,7 @@ NTSTATUS smb2cli_req_get_sent_iov(struct tevent_req *req,
struct smbXcli_req_state);
if (tevent_req_is_in_progress(req)) {
- return STATUS_PENDING;
+ return NT_STATUS_PENDING;
}
sent_iov[0].iov_base = state->smb2.hdr;
diff --git a/libcli/util/nterr.c b/libcli/util/nterr.c
index 6311cb48dc2..afcb6c4ba13 100644
--- a/libcli/util/nterr.c
+++ b/libcli/util/nterr.c
@@ -47,16 +47,10 @@ static const nt_err_code_struct special_errs[] =
{
{ "NT_STATUS_OK", NT_STATUS_OK },
{ "STATUS_NO_MORE_FILES", STATUS_NO_MORE_FILES },
- { "STATUS_STOPPED_ON_SYMLINK", STATUS_STOPPED_ON_SYMLINK },
- { "STATUS_NO_MORE_EAS", STATUS_NO_MORE_EAS },
{ "STATUS_INVALID_EA_NAME", STATUS_INVALID_EA_NAME },
- { "STATUS_EA_LIST_INCONSISTENT", STATUS_EA_LIST_INCONSISTENT },
- { "STATUS_INVALID_EA_FLAG", STATUS_INVALID_EA_FLAG },
{ "STATUS_BUFFER_OVERFLOW", STATUS_BUFFER_OVERFLOW },
{ "STATUS_MORE_ENTRIES", STATUS_MORE_ENTRIES },
{ "STATUS_SOME_UNMAPPED", STATUS_SOME_UNMAPPED },
- { "STATUS_NOTIFY_CLEANUP", STATUS_NOTIFY_CLEANUP },
- { "STATUS_NOTIFY_ENUM_DIR", STATUS_NOTIFY_ENUM_DIR },
{ "NT_STATUS_ERROR_DS_OBJ_STRING_NAME_EXISTS",
NT_STATUS_ERROR_DS_OBJ_STRING_NAME_EXISTS },
{ "NT_STATUS_ERROR_DS_INCOMPATIBLE_VERSION",
NT_STATUS_ERROR_DS_INCOMPATIBLE_VERSION },
{ "NT_STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP",
NT_STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP },
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 4b5f1ca1802..66cfd11bc58 100644
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -44,7 +44,6 @@ typedef uint32_t NTSTATUS;
/* Win32 status codes. */
#define ERROR_INVALID_PARAMETER NT_STATUS(0x0057)
#define ERROR_INSUFFICIENT_BUFFER NT_STATUS(0x007a)
-#define ERROR_INVALID_DATATYPE NT_STATUS(0x070c)
#define NT_STATUS_ERROR_DS_OBJ_STRING_NAME_EXISTS NT_STATUS(0x2071)
#define NT_STATUS_ERROR_DS_INCOMPATIBLE_VERSION
NT_STATUS(0x2177)
#define NT_STATUS_SMB_NO_PREAUTH_INTEGRITY_HASH_OVERLAP
NT_STATUS(0xC05D0000)
@@ -55,15 +54,8 @@ typedef uint32_t NTSTATUS;
#define STATUS_MORE_ENTRIES NT_STATUS_MORE_ENTRIES
#define STATUS_BUFFER_OVERFLOW NT_STATUS_BUFFER_OVERFLOW
#define STATUS_NO_MORE_FILES NT_STATUS_NO_MORE_FILES
-#define STATUS_NO_MORE_EAS NT_STATUS_NO_MORE_EAS
#define STATUS_INVALID_EA_NAME NT_STATUS_INVALID_EA_NAME
-#define STATUS_INVALID_EA_FLAG NT_STATUS_INVALID_EA_FLAG
#define STATUS_SOME_UNMAPPED NT_STATUS_SOME_NOT_MAPPED
-#define STATUS_NOTIFY_CLEANUP NT_STATUS_NOTIFY_CLEANUP
-#define STATUS_NOTIFY_ENUM_DIR NT_STATUS_NOTIFY_ENUM_DIR
-#define STATUS_PENDING NT_STATUS_PENDING
-#define STATUS_STOPPED_ON_SYMLINK NT_STATUS_STOPPED_ON_SYMLINK
-#define STATUS_EA_LIST_INCONSISTENT NT_STATUS_EA_LIST_INCONSISTENT
#define NT_STATUS_INACCESSIBLE_SYSTEM_SHORTCUT NT_STATUS(0x8000002d)
#define NT_STATUS_ABIOS_NOT_PRESENT NT_STATUS(0xC0000000 | 0x010f)
diff --git a/source3/client/client.c b/source3/client/client.c
index d233becba22..f65293849d0 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -4515,7 +4515,7 @@ static int cmd_notify(void)
status = cli_notify(cli, fnum, 1000, FILE_NOTIFY_CHANGE_ALL,
true,
talloc_tos(), &num_changes, &changes);
- if (NT_STATUS_EQUAL(status, STATUS_NOTIFY_ENUM_DIR)) {
+ if (NT_STATUS_EQUAL(status, NT_STATUS_NOTIFY_ENUM_DIR)) {
printf("NOTIFY_ENUM_DIR\n");
status = NT_STATUS_OK;
}
diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index da28559e49b..3169c8d5487 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1117,7 +1117,7 @@ static NTSTATUS close_directory(struct smb_request *req,
files_struct *fsp,
NTSTATUS notify_status;
if (fsp->conn->sconn->using_smb2) {
- notify_status = STATUS_NOTIFY_CLEANUP;
+ notify_status = NT_STATUS_NOTIFY_CLEANUP;
} else {
notify_status = NT_STATUS_OK;
}
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index b36a4c0003a..eb6317b7e8a 100644
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -411,11 +411,11 @@ static void smbd_notify_cancel_by_map(struct
notify_mid_map *map)
}
if (!NT_STATUS_IS_OK(sstatus)) {
- notify_status = STATUS_NOTIFY_CLEANUP;
+ notify_status = NT_STATUS_NOTIFY_CLEANUP;
} else if (smb2req->tcon == NULL) {
- notify_status = STATUS_NOTIFY_CLEANUP;
+ notify_status = NT_STATUS_NOTIFY_CLEANUP;
} else if (!NT_STATUS_IS_OK(smb2req->tcon->status)) {
- notify_status = STATUS_NOTIFY_CLEANUP;
+ notify_status = NT_STATUS_NOTIFY_CLEANUP;
}
}
diff --git a/source3/smbd/smb2_notify.c b/source3/smbd/smb2_notify.c
index 200a6e85d9a..75e591d1332 100644
--- a/source3/smbd/smb2_notify.c
+++ b/source3/smbd/smb2_notify.c
@@ -348,7 +348,7 @@ static void smbd_smb2_notify_reply(struct smb_request
*smbreq,
if (!NT_STATUS_IS_OK(error_code)) {
/* nothing */
} else if (len == 0) {
- state->status = STATUS_NOTIFY_ENUM_DIR;
+ state->status = NT_STATUS_NOTIFY_ENUM_DIR;
} else {
state->out_output_buffer = data_blob_talloc(state, buf, len);
if (state->out_output_buffer.data == NULL) {
diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index c11cc66a710..0a5083b5b8f 100644
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -1839,7 +1839,7 @@ static void smbd_smb2_request_pending_timer(struct
tevent_context *ev,
SIVAL(hdr, SMB2_HDR_PROTOCOL_ID, SMB2_MAGIC);
SSVAL(hdr, SMB2_HDR_LENGTH, SMB2_HDR_BODY);
SSVAL(hdr, SMB2_HDR_EPOCH, 0);
- SIVAL(hdr, SMB2_HDR_STATUS, NT_STATUS_V(STATUS_PENDING));
+ SIVAL(hdr, SMB2_HDR_STATUS, NT_STATUS_V(NT_STATUS_PENDING));
SSVAL(hdr, SMB2_HDR_OPCODE, SVAL(outhdr, SMB2_HDR_OPCODE));
SIVAL(hdr, SMB2_HDR_FLAGS, flags);
diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c
index 5b5bb79150d..cb626d86215 100644
--- a/source4/libcli/smb2/transport.c
+++ b/source4/libcli/smb2/transport.c
@@ -292,7 +292,7 @@ static void smb2_request_done(struct tevent_req *subreq)
req->recv_iov = NULL;
req->status = smb2cli_req_recv(req->subreq, req, &req->recv_iov, NULL,
0);
- if (NT_STATUS_EQUAL(req->status, STATUS_PENDING)) {
+ if (NT_STATUS_EQUAL(req->status, NT_STATUS_PENDING)) {
struct timeval endtime = smbXcli_req_endtime(subreq);
bool ok;
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index be6bc830ced..6b868df743a 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -1595,7 +1595,7 @@ static NTSTATUS ntvfs_map_notify_finish(struct
ntvfs_module_context *ntvfs,
switch (nt->nttrans.level) {
case RAW_NOTIFY_SMB2:
if (nt2->nttrans.out.num_changes == 0) {
- return STATUS_NOTIFY_ENUM_DIR;
+ return NT_STATUS_NOTIFY_ENUM_DIR;
}
nt->smb2.out.num_changes = nt2->nttrans.out.num_changes;
nt->smb2.out.changes = talloc_steal(req,
nt2->nttrans.out.changes);
diff --git a/source4/smb_server/smb2/receive.c
b/source4/smb_server/smb2/receive.c
index 3e5dc4de173..04241abcc39 100644
--- a/source4/smb_server/smb2/receive.c
+++ b/source4/smb_server/smb2/receive.c
@@ -628,7 +628,7 @@ NTSTATUS smb2srv_queue_pending(struct smb2srv_request *req)
return status;
}
- SIVAL(req->out.hdr, SMB2_HDR_STATUS, NT_STATUS_V(STATUS_PENDING));
+ SIVAL(req->out.hdr, SMB2_HDR_STATUS, NT_STATUS_V(NT_STATUS_PENDING));
SSVAL(req->out.hdr, SMB2_HDR_CREDIT, credits);
SSVAL(req->out.body, 0x02, 0);
diff --git a/source4/torture/smb2/notify.c b/source4/torture/smb2/notify.c
index d8aa44f5d4c..b65c116b75e 100644
--- a/source4/torture/smb2/notify.c
+++ b/source4/torture/smb2/notify.c
@@ -140,7 +140,7 @@ static bool test_valid_request(struct torture_context
*torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &n);
- CHECK_STATUS(status, STATUS_NOTIFY_ENUM_DIR);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_ENUM_DIR);
/*
* if the change response fits in the buffer we get
@@ -191,7 +191,7 @@ static bool test_valid_request(struct torture_context
*torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &n);
- CHECK_STATUS(status, STATUS_NOTIFY_ENUM_DIR);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_ENUM_DIR);
n.in.buffer_size = max_buffer_size;
req = smb2_notify_send(tree, &n);
@@ -205,7 +205,7 @@ static bool test_valid_request(struct torture_context
*torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &n);
- CHECK_STATUS(status, STATUS_NOTIFY_ENUM_DIR);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_ENUM_DIR);
/* if the buffer size is too large, we get invalid parameter */
n.in.recursive = 0x0000;
@@ -466,7 +466,7 @@ static bool torture_smb2_notify_dir(struct torture_context
*torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 9);
done:
@@ -1338,7 +1338,7 @@ static bool torture_smb2_notify_tree_disconnect_1(
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 0);
done:
@@ -1409,7 +1409,7 @@ static bool torture_smb2_notify_close(struct
torture_context *torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 0);
done:
@@ -1479,7 +1479,7 @@ static bool torture_smb2_notify_ulogoff(struct
torture_context *torture,
CHECK_STATUS(status, NT_STATUS_OK);
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 0);
done:
@@ -1556,7 +1556,7 @@ static bool torture_smb2_notify_session_reconnect(struct
torture_context *tortur
"session setup with previous_session_id failed");
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 0);
status = smb2_logoff(tree1->session);
@@ -1644,7 +1644,7 @@ static bool torture_smb2_notify_invalid_reauth(struct
torture_context *torture,
CHECK_STATUS(status, NT_STATUS_LOGON_FAILURE);
status = smb2_notify_recv(req, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_CLEANUP);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_CLEANUP);
CHECK_VAL(notify.smb2.out.num_changes, 0);
done:
@@ -2158,7 +2158,7 @@ static bool torture_smb2_notify_overflow(struct
torture_context *torture,
req1 = smb2_notify_send(tree, &(notify.smb2));
status = smb2_notify_recv(req1, torture, &(notify.smb2));
- CHECK_STATUS(status, STATUS_NOTIFY_ENUM_DIR);
+ CHECK_STATUS(status, NT_STATUS_NOTIFY_ENUM_DIR);
CHECK_VAL(notify.smb2.out.num_changes, 0);
done:
@@ -2564,7 +2564,7 @@ static bool torture_smb2_inotify_rename(struct
torture_context *torture,
req = smb2_notify_send(tree1, ¬ify);
torture_assert_not_null_goto(torture, req, ok, done, "smb2_notify_send
failed\n");
- while (!NT_STATUS_EQUAL(req->status, STATUS_PENDING)) {
+ while (!NT_STATUS_EQUAL(req->status, NT_STATUS_PENDING)) {
if (tevent_loop_once(torture->ev) != 0) {
goto done;
}
--
Samba Shared Repository
