[SCM] Samba Shared Repository - branch v3-2-test updated -
initial-v3-2-unstable-289-gc2645d2
Stefan Metzmacher
metze at samba.org
Fri Nov 9 20:27:17 GMT 2007
The branch, v3-2-test has been updated
via c2645d2164c05976a98bafed980b6029baf89977 (commit)
via 95530073de6d5b112391312bed373229af1824b0 (commit)
via 53a636828d2ba01603401086f4a5f72f9b5ea214 (commit)
via 42590e917af464f894bf4eb1490f0d1075b2c10e (commit)
via b1b8088cafa3ebbc94d700c7a029a2b74b7652ed (commit)
via 9ba00e7c167fb871a3d9acbd9fc5ce4e935d92c2 (commit)
from 9c57628dbd79d3d28f20d5d1ab62a68ae683d46e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit c2645d2164c05976a98bafed980b6029baf89977
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 9 14:39:45 2007 +0100
ndr: change NTSTAUS into enum ndr_err_code (samba3 callers)
lib/messages_local.c
rpc_client/ndr.c
smbd/notify_internal.c
utils/net_rpc_registry.c
metze
commit 95530073de6d5b112391312bed373229af1824b0
Author: metze <metze at 0c0555d6-39d7-0310-84fc-f1cc0bd64818>
Date: Fri Nov 9 19:24:25 2007 +0000
ndr: change NTSTAUS into enum ndr_err_code (ndrdump)
librpc/tools/ndrdump.c
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25919 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit 53a636828d2ba01603401086f4a5f72f9b5ea214
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 9 14:38:47 2007 +0100
rerun make idl
metze
commit 42590e917af464f894bf4eb1490f0d1075b2c10e
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 9 13:00:43 2007 +0100
ndr: change NTSTAUS into enum ndr_err_code (samba3 handwritten stuff)
ndr_misc.c
ndr_sec.h
ndr_sec_helper.c
librpc/ndr/sid.c
metze
commit b1b8088cafa3ebbc94d700c7a029a2b74b7652ed
Author: metze <metze at samba.org>
Date: Fri Nov 9 19:23:40 2007 +0000
ndr: change NTSTAUS into enum ndr_err_code (basic stuff)
librpc/ndr/
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25916 0c0555d6-39d7-0310-84fc-f1cc0bd64818
commit 9ba00e7c167fb871a3d9acbd9fc5ce4e935d92c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Nov 9 21:20:46 2007 +0100
prepare changes in ndr code
metze
-----------------------------------------------------------------------
Summary of changes:
source/lib/messages_local.c | 16 +-
source/librpc/gen_ndr/ndr_dfs.c | 472 +++++-----
source/librpc/gen_ndr/ndr_dfs.h | 22 +-
source/librpc/gen_ndr/ndr_echo.c | 184 ++--
source/librpc/gen_ndr/ndr_echo.h | 2 +-
source/librpc/gen_ndr/ndr_epmapper.c | 344 ++++----
source/librpc/gen_ndr/ndr_epmapper.h | 6 +-
source/librpc/gen_ndr/ndr_eventlog.c | 208 +++---
source/librpc/gen_ndr/ndr_eventlog.h | 6 +-
source/librpc/gen_ndr/ndr_initshutdown.c | 40 +-
source/librpc/gen_ndr/ndr_initshutdown.h | 6 +-
source/librpc/gen_ndr/ndr_lsa.c | 1128 +++++++++++-----------
source/librpc/gen_ndr/ndr_lsa.h | 22 +-
source/librpc/gen_ndr/ndr_messaging.c | 16 +-
source/librpc/gen_ndr/ndr_messaging.h | 10 +-
source/librpc/gen_ndr/ndr_netlogon.c | 936 ++++++++++----------
source/librpc/gen_ndr/ndr_netlogon.h | 42 +-
source/librpc/gen_ndr/ndr_notify.c | 32 +-
source/librpc/gen_ndr/ndr_notify.h | 14 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 1488 +++++++++++++++---------------
source/librpc/gen_ndr/ndr_srvsvc.h | 6 +-
source/librpc/gen_ndr/ndr_svcctl.c | 384 ++++----
source/librpc/gen_ndr/ndr_svcctl.h | 6 +-
source/librpc/gen_ndr/ndr_unixinfo.c | 48 +-
source/librpc/gen_ndr/ndr_unixinfo.h | 2 +-
source/librpc/gen_ndr/ndr_winreg.c | 360 ++++----
source/librpc/gen_ndr/ndr_winreg.h | 6 +-
source/librpc/gen_ndr/ndr_wkssvc.c | 440 +++++-----
source/librpc/gen_ndr/ndr_wkssvc.h | 2 +-
source/librpc/gen_ndr/srv_dfs.c | 230 +++---
source/librpc/gen_ndr/srv_echo.c | 100 +-
source/librpc/gen_ndr/srv_epmapper.c | 80 +-
source/librpc/gen_ndr/srv_eventlog.c | 240 +++---
source/librpc/gen_ndr/srv_initshutdown.c | 30 +-
source/librpc/gen_ndr/srv_lsa.c | 820 ++++++++--------
source/librpc/gen_ndr/srv_netlogon.c | 470 +++++-----
source/librpc/gen_ndr/srv_srvsvc.c | 540 ++++++------
source/librpc/gen_ndr/srv_svcctl.c | 440 +++++-----
source/librpc/gen_ndr/srv_unixinfo.c | 50 +-
source/librpc/gen_ndr/srv_winreg.c | 350 ++++----
source/librpc/gen_ndr/srv_wkssvc.c | 310 ++++----
source/librpc/ndr/libndr.h | 25 +-
source/librpc/ndr/ndr.c | 150 ++--
source/librpc/ndr/ndr_basic.c | 182 ++--
source/librpc/ndr/ndr_misc.c | 24 +-
source/librpc/ndr/ndr_sec.h | 8 +-
source/librpc/ndr/ndr_sec_helper.c | 112 ++--
source/librpc/ndr/ndr_string.c | 42 +-
source/librpc/ndr/sid.c | 44 +-
source/librpc/tools/ndrdump.c | 22 +-
source/rpc_client/ndr.c | 13 +-
source/smbd/notify_internal.c | 37 +-
source/utils/net_rpc_registry.c | 9 +-
53 files changed, 5302 insertions(+), 5274 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/messages_local.c b/source/lib/messages_local.c
index db098f2..5f7c46f 100644
--- a/source/lib/messages_local.c
+++ b/source/lib/messages_local.c
@@ -142,7 +142,7 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
struct messaging_array *result;
TDB_DATA data;
DATA_BLOB blob;
- NTSTATUS status;
+ enum ndr_err_code ndr_err;
if (!(result = TALLOC_ZERO_P(mem_ctx, struct messaging_array))) {
return NT_STATUS_NO_MEMORY;
@@ -157,15 +157,15 @@ static NTSTATUS messaging_tdb_fetch(TDB_CONTEXT *msg_tdb,
blob = data_blob_const(data.dptr, data.dsize);
- status = ndr_pull_struct_blob(
+ ndr_err = ndr_pull_struct_blob(
&blob, result, result,
(ndr_pull_flags_fn_t)ndr_pull_messaging_array);
SAFE_FREE(data.dptr);
- if (!NT_STATUS_IS_OK(status)) {
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
TALLOC_FREE(result);
- return status;
+ return ndr_map_error2ntstatus(ndr_err);
}
if (DEBUGLEVEL >= 10) {
@@ -187,7 +187,7 @@ static NTSTATUS messaging_tdb_store(TDB_CONTEXT *msg_tdb,
{
TDB_DATA data;
DATA_BLOB blob;
- NTSTATUS status;
+ enum ndr_err_code ndr_err;
TALLOC_CTX *mem_ctx;
int ret;
@@ -200,13 +200,13 @@ static NTSTATUS messaging_tdb_store(TDB_CONTEXT *msg_tdb,
return NT_STATUS_NO_MEMORY;
}
- status = ndr_push_struct_blob(
+ ndr_err = ndr_push_struct_blob(
&blob, mem_ctx, array,
(ndr_push_flags_fn_t)ndr_push_messaging_array);
- if (!NT_STATUS_IS_OK(status)) {
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
talloc_free(mem_ctx);
- return status;
+ return ndr_map_error2ntstatus(ndr_err);
}
if (DEBUGLEVEL >= 10) {
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index bc76339..4b26487 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -3,18 +3,18 @@
#include "includes.h"
#include "librpc/gen_ndr/ndr_dfs.h"
-static NTSTATUS ndr_push_dfs_ManagerVersion(struct ndr_push *ndr, int ndr_flags, enum dfs_ManagerVersion r)
+static enum ndr_err_code ndr_push_dfs_ManagerVersion(struct ndr_push *ndr, int ndr_flags, enum dfs_ManagerVersion r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_ManagerVersion(struct ndr_pull *ndr, int ndr_flags, enum dfs_ManagerVersion *r)
+static enum ndr_err_code ndr_pull_dfs_ManagerVersion(struct ndr_pull *ndr, int ndr_flags, enum dfs_ManagerVersion *r)
{
uint32_t v;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_ManagerVersion(struct ndr_print *ndr, const char *name, enum dfs_ManagerVersion r)
@@ -29,24 +29,24 @@ _PUBLIC_ void ndr_print_dfs_ManagerVersion(struct ndr_print *ndr, const char *na
ndr_print_enum(ndr, name, "ENUM", val, r);
}
-static NTSTATUS ndr_push_dfs_Info0(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info0 *r)
+static enum ndr_err_code ndr_push_dfs_Info0(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info0 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 1));
}
if (ndr_flags & NDR_BUFFERS) {
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info0(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info0 *r)
+static enum ndr_err_code ndr_pull_dfs_Info0(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info0 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 1));
}
if (ndr_flags & NDR_BUFFERS) {
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info0(struct ndr_print *ndr, const char *name, const struct dfs_Info0 *r)
@@ -56,7 +56,7 @@ _PUBLIC_ void ndr_print_dfs_Info0(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info1(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info1 *r)
+static enum ndr_err_code ndr_push_dfs_Info1(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info1 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -70,10 +70,10 @@ static NTSTATUS ndr_push_dfs_Info1(struct ndr_push *ndr, int ndr_flags, const st
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->path, ndr_charset_length(r->path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info1(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info1 *r)
+static enum ndr_err_code ndr_pull_dfs_Info1(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info1 *r)
{
uint32_t _ptr_path;
TALLOC_CTX *_mem_save_path_0;
@@ -100,7 +100,7 @@ static NTSTATUS ndr_pull_dfs_Info1(struct ndr_pull *ndr, int ndr_flags, struct d
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_path_0, 0);
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info1(struct ndr_print *ndr, const char *name, const struct dfs_Info1 *r)
@@ -116,18 +116,18 @@ _PUBLIC_ void ndr_print_dfs_Info1(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-_PUBLIC_ NTSTATUS ndr_push_dfs_VolumeState(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_dfs_VolumeState(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-_PUBLIC_ NTSTATUS ndr_pull_dfs_VolumeState(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_dfs_VolumeState(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
{
uint32_t v;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_VolumeState(struct ndr_print *ndr, const char *name, uint32_t r)
@@ -143,7 +143,7 @@ _PUBLIC_ void ndr_print_dfs_VolumeState(struct ndr_print *ndr, const char *name,
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info2(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info2 *r)
+static enum ndr_err_code ndr_push_dfs_Info2(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -166,10 +166,10 @@ static NTSTATUS ndr_push_dfs_Info2(struct ndr_push *ndr, int ndr_flags, const st
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->comment, ndr_charset_length(r->comment, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info2(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info2 *r)
+static enum ndr_err_code ndr_pull_dfs_Info2(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info2 *r)
{
uint32_t _ptr_path;
TALLOC_CTX *_mem_save_path_0;
@@ -218,7 +218,7 @@ static NTSTATUS ndr_pull_dfs_Info2(struct ndr_pull *ndr, int ndr_flags, struct d
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_comment_0, 0);
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info2(struct ndr_print *ndr, const char *name, const struct dfs_Info2 *r)
@@ -242,18 +242,18 @@ _PUBLIC_ void ndr_print_dfs_Info2(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-_PUBLIC_ NTSTATUS ndr_push_dfs_StorageState(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_dfs_StorageState(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-_PUBLIC_ NTSTATUS ndr_pull_dfs_StorageState(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_dfs_StorageState(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
{
uint32_t v;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_StorageState(struct ndr_print *ndr, const char *name, uint32_t r)
@@ -266,7 +266,7 @@ _PUBLIC_ void ndr_print_dfs_StorageState(struct ndr_print *ndr, const char *name
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_StorageInfo(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo *r)
+static enum ndr_err_code ndr_push_dfs_StorageInfo(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -288,10 +288,10 @@ static NTSTATUS ndr_push_dfs_StorageInfo(struct ndr_push *ndr, int ndr_flags, co
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->share, ndr_charset_length(r->share, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_StorageInfo(struct ndr_pull *ndr, int ndr_flags, struct dfs_StorageInfo *r)
+static enum ndr_err_code ndr_pull_dfs_StorageInfo(struct ndr_pull *ndr, int ndr_flags, struct dfs_StorageInfo *r)
{
uint32_t _ptr_server;
TALLOC_CTX *_mem_save_server_0;
@@ -339,7 +339,7 @@ static NTSTATUS ndr_pull_dfs_StorageInfo(struct ndr_pull *ndr, int ndr_flags, st
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_share_0, 0);
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_StorageInfo(struct ndr_print *ndr, const char *name, const struct dfs_StorageInfo *r)
@@ -362,7 +362,7 @@ _PUBLIC_ void ndr_print_dfs_StorageInfo(struct ndr_print *ndr, const char *name,
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info3(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info3 *r)
+static enum ndr_err_code ndr_push_dfs_Info3(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info3 *r)
{
uint32_t cntr_stores_1;
if (ndr_flags & NDR_SCALARS) {
@@ -396,10 +396,10 @@ static NTSTATUS ndr_push_dfs_Info3(struct ndr_push *ndr, int ndr_flags, const st
}
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info3(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info3 *r)
+static enum ndr_err_code ndr_pull_dfs_Info3(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info3 *r)
{
uint32_t _ptr_path;
TALLOC_CTX *_mem_save_path_0;
@@ -477,7 +477,7 @@ static NTSTATUS ndr_pull_dfs_Info3(struct ndr_pull *ndr, int ndr_flags, struct d
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->stores, r->num_stores));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info3(struct ndr_print *ndr, const char *name, const struct dfs_Info3 *r)
@@ -518,7 +518,7 @@ _PUBLIC_ void ndr_print_dfs_Info3(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info4(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info4 *r)
+static enum ndr_err_code ndr_push_dfs_Info4(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info4 *r)
{
uint32_t cntr_stores_1;
if (ndr_flags & NDR_SCALARS) {
@@ -555,10 +555,10 @@ static NTSTATUS ndr_push_dfs_Info4(struct ndr_push *ndr, int ndr_flags, const st
}
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info4(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info4 *r)
+static enum ndr_err_code ndr_pull_dfs_Info4(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info4 *r)
{
uint32_t _ptr_path;
TALLOC_CTX *_mem_save_path_0;
@@ -639,7 +639,7 @@ static NTSTATUS ndr_pull_dfs_Info4(struct ndr_pull *ndr, int ndr_flags, struct d
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->stores, r->num_stores));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info4(struct ndr_print *ndr, const char *name, const struct dfs_Info4 *r)
@@ -682,18 +682,18 @@ _PUBLIC_ void ndr_print_dfs_Info4(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-_PUBLIC_ NTSTATUS ndr_push_dfs_PropertyFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+_PUBLIC_ enum ndr_err_code ndr_push_dfs_PropertyFlags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-_PUBLIC_ NTSTATUS ndr_pull_dfs_PropertyFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_dfs_PropertyFlags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
{
uint32_t v;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_PropertyFlags(struct ndr_print *ndr, const char *name, uint32_t r)
@@ -708,7 +708,7 @@ _PUBLIC_ void ndr_print_dfs_PropertyFlags(struct ndr_print *ndr, const char *nam
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info5(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info5 *r)
+static enum ndr_err_code ndr_push_dfs_Info5(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info5 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -736,10 +736,10 @@ static NTSTATUS ndr_push_dfs_Info5(struct ndr_push *ndr, int ndr_flags, const st
}
NDR_CHECK(ndr_push_GUID(ndr, NDR_BUFFERS, &r->guid));
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info5(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info5 *r)
+static enum ndr_err_code ndr_pull_dfs_Info5(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info5 *r)
{
uint32_t _ptr_path;
TALLOC_CTX *_mem_save_path_0;
@@ -793,7 +793,7 @@ static NTSTATUS ndr_pull_dfs_Info5(struct ndr_pull *ndr, int ndr_flags, struct d
}
NDR_CHECK(ndr_pull_GUID(ndr, NDR_BUFFERS, &r->guid));
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info5(struct ndr_print *ndr, const char *name, const struct dfs_Info5 *r)
@@ -821,18 +821,18 @@ _PUBLIC_ void ndr_print_dfs_Info5(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Target_PriorityClass(struct ndr_push *ndr, int ndr_flags, enum dfs_Target_PriorityClass r)
+static enum ndr_err_code ndr_push_dfs_Target_PriorityClass(struct ndr_push *ndr, int ndr_flags, enum dfs_Target_PriorityClass r)
{
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Target_PriorityClass(struct ndr_pull *ndr, int ndr_flags, enum dfs_Target_PriorityClass *r)
+static enum ndr_err_code ndr_pull_dfs_Target_PriorityClass(struct ndr_pull *ndr, int ndr_flags, enum dfs_Target_PriorityClass *r)
{
uint32_t v;
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
*r = v;
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Target_PriorityClass(struct ndr_print *ndr, const char *name, enum dfs_Target_PriorityClass r)
@@ -850,7 +850,7 @@ _PUBLIC_ void ndr_print_dfs_Target_PriorityClass(struct ndr_print *ndr, const ch
ndr_print_enum(ndr, name, "ENUM", val, r);
}
-static NTSTATUS ndr_push_dfs_Target_Priority(struct ndr_push *ndr, int ndr_flags, const struct dfs_Target_Priority *r)
+static enum ndr_err_code ndr_push_dfs_Target_Priority(struct ndr_push *ndr, int ndr_flags, const struct dfs_Target_Priority *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -860,10 +860,10 @@ static NTSTATUS ndr_push_dfs_Target_Priority(struct ndr_push *ndr, int ndr_flags
}
if (ndr_flags & NDR_BUFFERS) {
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Target_Priority(struct ndr_pull *ndr, int ndr_flags, struct dfs_Target_Priority *r)
+static enum ndr_err_code ndr_pull_dfs_Target_Priority(struct ndr_pull *ndr, int ndr_flags, struct dfs_Target_Priority *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
@@ -873,7 +873,7 @@ static NTSTATUS ndr_pull_dfs_Target_Priority(struct ndr_pull *ndr, int ndr_flags
}
if (ndr_flags & NDR_BUFFERS) {
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Target_Priority(struct ndr_print *ndr, const char *name, const struct dfs_Target_Priority *r)
@@ -886,7 +886,7 @@ _PUBLIC_ void ndr_print_dfs_Target_Priority(struct ndr_print *ndr, const char *n
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_StorageInfo2(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo2 *r)
+static enum ndr_err_code ndr_push_dfs_StorageInfo2(struct ndr_push *ndr, int ndr_flags, const struct dfs_StorageInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -896,10 +896,10 @@ static NTSTATUS ndr_push_dfs_StorageInfo2(struct ndr_push *ndr, int ndr_flags, c
if (ndr_flags & NDR_BUFFERS) {
NDR_CHECK(ndr_push_dfs_StorageInfo(ndr, NDR_BUFFERS, &r->info));
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_StorageInfo2(struct ndr_pull *ndr, int ndr_flags, struct dfs_StorageInfo2 *r)
+static enum ndr_err_code ndr_pull_dfs_StorageInfo2(struct ndr_pull *ndr, int ndr_flags, struct dfs_StorageInfo2 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
@@ -909,7 +909,7 @@ static NTSTATUS ndr_pull_dfs_StorageInfo2(struct ndr_pull *ndr, int ndr_flags, s
if (ndr_flags & NDR_BUFFERS) {
NDR_CHECK(ndr_pull_dfs_StorageInfo(ndr, NDR_BUFFERS, &r->info));
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_StorageInfo2(struct ndr_print *ndr, const char *name, const struct dfs_StorageInfo2 *r)
@@ -921,7 +921,7 @@ _PUBLIC_ void ndr_print_dfs_StorageInfo2(struct ndr_print *ndr, const char *name
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info6(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info6 *r)
+static enum ndr_err_code ndr_push_dfs_Info6(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info6 *r)
{
uint32_t cntr_stores_1;
if (ndr_flags & NDR_SCALARS) {
@@ -960,10 +960,10 @@ static NTSTATUS ndr_push_dfs_Info6(struct ndr_push *ndr, int ndr_flags, const st
}
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
-static NTSTATUS ndr_pull_dfs_Info6(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info6 *r)
+static enum ndr_err_code ndr_pull_dfs_Info6(struct ndr_pull *ndr, int ndr_flags, struct dfs_Info6 *r)
{
uint32_t _ptr_entry_path;
TALLOC_CTX *_mem_save_entry_path_0;
@@ -1046,7 +1046,7 @@ static NTSTATUS ndr_pull_dfs_Info6(struct ndr_pull *ndr, int ndr_flags, struct d
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->stores, r->num_stores));
}
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
}
_PUBLIC_ void ndr_print_dfs_Info6(struct ndr_print *ndr, const char *name, const struct dfs_Info6 *r)
@@ -1091,7 +1091,7 @@ _PUBLIC_ void ndr_print_dfs_Info6(struct ndr_print *ndr, const char *name, const
ndr->depth--;
}
-static NTSTATUS ndr_push_dfs_Info7(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info7 *r)
+static enum ndr_err_code ndr_push_dfs_Info7(struct ndr_push *ndr, int ndr_flags, const struct dfs_Info7 *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
@@ -1100,10 +1100,10 @@ static NTSTATUS ndr_push_dfs_Info7(struct ndr_push *ndr, int ndr_flags, const st
if (ndr_flags & NDR_BUFFERS) {
NDR_CHECK(ndr_push_GUID(ndr, NDR_BUFFERS, &r->generation_guid));
}
- return NT_STATUS_OK;
+ return NDR_ERR_SUCCESS;
--
Samba Shared Repository
More information about the samba-cvs
mailing list