[SCM] Samba Shared Repository - branch v3-6-test updated
Stefan Metzmacher
metze at samba.org
Mon Jan 31 09:33:50 MST 2011
The branch, v3-6-test has been updated
via 5e705b5 librpc/rpc: add dcerpc_fault_to_nt_status() mapping from DCERPC_FAULT_SEC_PKG_ERROR
via 85358c0 dcerpc.idl: add DCERPC_FAULT_SEC_PKG_ERROR
via cf4380a s4:libcli/util: display NT_STATUS_RPC_SEC_PKG_ERROR in error strings
via 7bc01d2 s3:libsmb: display NT_STATUS_RPC_SEC_PKG_ERROR in error strings
via c01a674 libcli/util: add NT_STATUS_RPC_SEC_PKG_ERROR define
from 3d2f728 s3:lib/events: use DLIST_DEMOTE() for fd events
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 5e705b53d6456e140e87aa92fd1c5fe2aa55ffd3
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 30 17:34:35 2011 +0100
librpc/rpc: add dcerpc_fault_to_nt_status() mapping from DCERPC_FAULT_SEC_PKG_ERROR
metze
Autobuild-User: Stefan Metzmacher <metze at samba.org>
Autobuild-Date: Sun Jan 30 18:24:04 CET 2011 on sn-devel-104
(cherry picked from commit 4d66e0ef93177d6029ffcd57299f15e876f25ff9)
commit 85358c0534472fde71e304ddada678b61637ba40
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 30 17:34:11 2011 +0100
dcerpc.idl: add DCERPC_FAULT_SEC_PKG_ERROR
metze
(cherry picked from commit 8d07deaeaacbd376f9824ac350c01510e05a76ca)
commit cf4380aa002754ae69d9eee1bee0b4ebbd57223d
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 30 17:33:48 2011 +0100
s4:libcli/util: display NT_STATUS_RPC_SEC_PKG_ERROR in error strings
metze
(cherry picked from commit f284acf9e1b19efb7e1357b1098b3bb5c26fa377)
commit 7bc01d23934cbdfdd5c8f8f83d06331d249aa053
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 30 17:33:13 2011 +0100
s3:libsmb: display NT_STATUS_RPC_SEC_PKG_ERROR in error strings
metze
(cherry picked from commit e2e426588bc6b011e0096c7fc3cb0823d7796bb3)
commit c01a67494d1775bcd0cadfa8d3b6884e8f237928
Author: Stefan Metzmacher <metze at samba.org>
Date: Sun Jan 30 17:32:19 2011 +0100
libcli/util: add NT_STATUS_RPC_SEC_PKG_ERROR define
metze
(cherry picked from commit 24acddf8063fa5cdbd281f3f30a78d5e0ba4d882)
-----------------------------------------------------------------------
Summary of changes:
libcli/util/ntstatus.h | 1 +
librpc/idl/dcerpc.idl | 1 +
librpc/rpc/dcerpc_error.c | 2 ++
source3/libsmb/nterr.c | 1 +
source4/libcli/util/nterr.c | 1 +
5 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h
index 32c8ce0..d7c6038 100644
--- a/libcli/util/ntstatus.h
+++ b/libcli/util/ntstatus.h
@@ -609,6 +609,7 @@ typedef uint32_t NTSTATUS;
#define NT_STATUS_RPC_PROTOCOL_ERROR NT_STATUS(0xC0000000 | 0x2001D)
#define NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE NT_STATUS(0xC0000000 | 0x2002E)
#define NT_STATUS_RPC_CANNOT_SUPPORT NT_STATUS(0xC0000000 | 0x20041)
+#define NT_STATUS_RPC_SEC_PKG_ERROR NT_STATUS(0xC0000000 | 0x20057)
#define NT_STATUS_RPC_SS_CONTEXT_MISMATCH NT_STATUS(0xC0000000 | 0x30005)
#define NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE NT_STATUS(0xC000000 | 0x3000A)
#define NT_STATUS_RPC_BAD_STUB_DATA NT_STATUS(0xC0000000 | 0x3000C)
diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
index d98d7bd..2ecdbc4 100644
--- a/librpc/idl/dcerpc.idl
+++ b/librpc/idl/dcerpc.idl
@@ -153,6 +153,7 @@ interface dcerpc
const int DCERPC_FAULT_OTHER = 0x00000001;
const int DCERPC_FAULT_ACCESS_DENIED = 0x00000005;
const int DCERPC_FAULT_CANT_PERFORM = 0x000006d8;
+ const int DCERPC_FAULT_SEC_PKG_ERROR = 0x00000721;
/* we return this fault when we haven't yet run the test
to see what fault w2k3 returns in this case */
diff --git a/librpc/rpc/dcerpc_error.c b/librpc/rpc/dcerpc_error.c
index b4289db..17095e5 100644
--- a/librpc/rpc/dcerpc_error.c
+++ b/librpc/rpc/dcerpc_error.c
@@ -114,6 +114,8 @@ _PUBLIC_ NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code)
return NT_STATUS_RPC_CALL_FAILED;
case DCERPC_FAULT_ACCESS_DENIED:
return NT_STATUS_ACCESS_DENIED;
+ case DCERPC_FAULT_SEC_PKG_ERROR:
+ return NT_STATUS_RPC_SEC_PKG_ERROR;
}
return NT_STATUS_RPC_PROTOCOL_ERROR;
diff --git a/source3/libsmb/nterr.c b/source3/libsmb/nterr.c
index 44f3b3f..5fa9ade 100644
--- a/source3/libsmb/nterr.c
+++ b/source3/libsmb/nterr.c
@@ -550,6 +550,7 @@ static const nt_err_code_struct nt_errs[] =
{ "NT_STATUS_RPC_PROTOCOL_ERROR", NT_STATUS_RPC_PROTOCOL_ERROR },
{ "NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE", NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE },
{ "NT_STATUS_RPC_CANNOT_SUPPORT", NT_STATUS_RPC_CANNOT_SUPPORT },
+ { "NT_STATUS_RPC_SEC_PKG_ERROR", NT_STATUS_RPC_SEC_PKG_ERROR },
{ "NT_STATUS_RPC_SS_CONTEXT_MISMATCH", NT_STATUS_RPC_SS_CONTEXT_MISMATCH },
{ "NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE", NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE },
{ "NT_STATUS_RPC_BAD_STUB_DATA", NT_STATUS_RPC_BAD_STUB_DATA },
diff --git a/source4/libcli/util/nterr.c b/source4/libcli/util/nterr.c
index 72a7b37..82e773c 100644
--- a/source4/libcli/util/nterr.c
+++ b/source4/libcli/util/nterr.c
@@ -551,6 +551,7 @@ static const nt_err_code_struct nt_errs[] =
{ "NT_STATUS_RPC_PROTOCOL_ERROR", NT_STATUS_RPC_PROTOCOL_ERROR },
{ "NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE", NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE },
{ "NT_STATUS_RPC_CANNOT_SUPPORT", NT_STATUS_RPC_CANNOT_SUPPORT },
+ { "NT_STATUS_RPC_SEC_PKG_ERROR", NT_STATUS_RPC_SEC_PKG_ERROR },
{ "NT_STATUS_RPC_SS_CONTEXT_MISMATCH", NT_STATUS_RPC_SS_CONTEXT_MISMATCH },
{ "NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE", NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE },
{ "NT_STATUS_RPC_BAD_STUB_DATA", NT_STATUS_RPC_BAD_STUB_DATA },
--
Samba Shared Repository
More information about the samba-cvs
mailing list