The branch, v3-2-test has been updated
via 83b3ecde1312092fd9875a2a8628652ffa6b6aca (commit)
from 3625ed395c23101095321de80e89fcbc8c76be4c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 83b3ecde1312092fd9875a2a8628652ffa6b6aca
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Sat Oct 27 11:57:48 2007 +0200
rerun make idl
metze
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/ndr_dfs.c | 28 ++-
source/librpc/gen_ndr/ndr_echo.c | 64 ++++--
source/librpc/gen_ndr/ndr_epmapper.c | 36 ++-
source/librpc/gen_ndr/ndr_eventlog.c | 44 +++-
source/librpc/gen_ndr/ndr_lsa.c | 468 +++++++++++++++++++++++++---------
source/librpc/gen_ndr/ndr_netlogon.c | 280 +++++++++++++++-----
source/librpc/gen_ndr/ndr_srvsvc.c | 212 ++++++++++++----
source/librpc/gen_ndr/ndr_svcctl.c | 316 +++++++++++++++++------
source/librpc/gen_ndr/ndr_unixinfo.c | 24 ++-
source/librpc/gen_ndr/ndr_winreg.c | 240 +++++++++++++-----
source/librpc/gen_ndr/ndr_wkssvc.c | 60 ++++-
11 files changed, 1325 insertions(+), 447 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index 959abdc..bc76339 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -3113,7 +3113,9 @@ _PUBLIC_ NTSTATUS ndr_push_dfs_GetManagerVersion(struct
ndr_push *ndr, int flags
if (flags & NDR_IN) {
}
if (flags & NDR_OUT) {
- if (r->out.version == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.version == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_dfs_ManagerVersion(ndr, NDR_SCALARS,
*r->out.version));
}
return NT_STATUS_OK;
@@ -3167,12 +3169,16 @@ _PUBLIC_ void ndr_print_dfs_GetManagerVersion(struct
ndr_print *ndr, const char
static NTSTATUS ndr_push_dfs_Add(struct ndr_push *ndr, int flags, const struct
dfs_Add *r)
{
if (flags & NDR_IN) {
- if (r->in.path == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.path == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.path, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.path, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.path,
ndr_charset_length(r->in.path, CH_UTF16), sizeof(uint16_t), CH_UTF16));
- if (r->in.server == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.server == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.server, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.server, CH_UTF16)));
@@ -3309,7 +3315,9 @@ _PUBLIC_ void ndr_print_dfs_Add(struct ndr_print *ndr,
const char *name, int fla
static NTSTATUS ndr_push_dfs_Remove(struct ndr_push *ndr, int flags, const
struct dfs_Remove *r)
{
if (flags & NDR_IN) {
- if (r->in.dfs_entry_path == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.dfs_entry_path == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.dfs_entry_path, CH_UTF16)));
@@ -3451,7 +3459,9 @@ static NTSTATUS ndr_push_dfs_SetInfo(struct ndr_push
*ndr, int flags, const stru
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->in.sharename, ndr_charset_length(r->in.sharename, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
- if (r->in.info == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.info == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.info,
r->in.level));
NDR_CHECK(ndr_push_dfs_Info(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.info));
}
@@ -3592,7 +3602,9 @@ static NTSTATUS ndr_push_dfs_GetInfo(struct ndr_push
*ndr, int flags, const stru
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.level));
}
if (flags & NDR_OUT) {
- if (r->out.info == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.info == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info,
r->in.level));
NDR_CHECK(ndr_push_dfs_Info(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.info));
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -4552,7 +4564,9 @@ _PUBLIC_ void ndr_print_dfs_RemoveStdRoot(struct
ndr_print *ndr, const char *nam
static NTSTATUS ndr_push_dfs_ManagerInitialize(struct ndr_push *ndr, int
flags, const struct dfs_ManagerInitialize *r)
{
if (flags & NDR_IN) {
- if (r->in.servername == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.servername == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.servername, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.servername, CH_UTF16)));
diff --git a/source/librpc/gen_ndr/ndr_echo.c b/source/librpc/gen_ndr/ndr_echo.c
index 95157fb..b678f92 100644
--- a/source/librpc/gen_ndr/ndr_echo.c
+++ b/source/librpc/gen_ndr/ndr_echo.c
@@ -643,7 +643,9 @@ static NTSTATUS ndr_push_echo_AddOne(struct ndr_push *ndr,
int flags, const stru
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.in_data));
}
if (flags & NDR_OUT) {
- if (r->out.out_data == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.out_data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.out_data));
}
return NT_STATUS_OK;
@@ -862,15 +864,21 @@ _PUBLIC_ void ndr_print_echo_SourceData(struct ndr_print
*ndr, const char *name,
static NTSTATUS ndr_push_echo_TestCall(struct ndr_push *ndr, int flags, const
struct echo_TestCall *r)
{
if (flags & NDR_IN) {
- if (r->in.s1 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.s1 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.s1, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->in.s1, CH_UTF16)));
NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.s1,
ndr_charset_length(r->in.s1, CH_UTF16), sizeof(uint16_t), CH_UTF16));
}
if (flags & NDR_OUT) {
- if (r->out.s2 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
- if (*r->out.s2 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.s2 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
+ if (*r->out.s2 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_ref_ptr(ndr));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(*r->out.s2, CH_UTF16)));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -953,7 +961,9 @@ static NTSTATUS ndr_push_echo_TestCall2(struct ndr_push
*ndr, int flags, const s
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level));
}
if (flags & NDR_OUT) {
- if (r->out.info == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.info == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.info,
r->in.level));
NDR_CHECK(ndr_push_echo_Info(ndr, NDR_SCALARS, r->out.info));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
@@ -1059,20 +1069,32 @@ _PUBLIC_ void ndr_print_echo_TestSleep(struct ndr_print
*ndr, const char *name,
static NTSTATUS ndr_push_echo_TestEnum(struct ndr_push *ndr, int flags, const
struct echo_TestEnum *r)
{
if (flags & NDR_IN) {
- if (r->in.foo1 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.foo1 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Enum1(ndr, NDR_SCALARS, *r->in.foo1));
- if (r->in.foo2 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.foo2 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Enum2(ndr, NDR_SCALARS, r->in.foo2));
- if (r->in.foo3 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.foo3 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r->in.foo3,
*r->in.foo1));
NDR_CHECK(ndr_push_echo_Enum3(ndr, NDR_SCALARS, r->in.foo3));
}
if (flags & NDR_OUT) {
- if (r->out.foo1 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.foo1 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Enum1(ndr, NDR_SCALARS, *r->out.foo1));
- if (r->out.foo2 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.foo2 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Enum2(ndr, NDR_SCALARS, r->out.foo2));
- if (r->out.foo3 == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.foo3 == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.foo3,
*r->out.foo1));
NDR_CHECK(ndr_push_echo_Enum3(ndr, NDR_SCALARS, r->out.foo3));
}
@@ -1192,11 +1214,15 @@ _PUBLIC_ void ndr_print_echo_TestEnum(struct ndr_print
*ndr, const char *name, i
static NTSTATUS ndr_push_echo_TestSurrounding(struct ndr_push *ndr, int flags,
const struct echo_TestSurrounding *r)
{
if (flags & NDR_IN) {
- if (r->in.data == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Surrounding(ndr, NDR_SCALARS,
r->in.data));
}
if (flags & NDR_OUT) {
- if (r->out.data == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_echo_Surrounding(ndr, NDR_SCALARS,
r->out.data));
}
return NT_STATUS_OK;
@@ -1261,10 +1287,16 @@ _PUBLIC_ void ndr_print_echo_TestSurrounding(struct
ndr_print *ndr, const char *
static NTSTATUS ndr_push_echo_TestDoublePointer(struct ndr_push *ndr, int
flags, const struct echo_TestDoublePointer *r)
{
if (flags & NDR_IN) {
- if (r->in.data == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
- if (*r->in.data == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
+ if (*r->in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_ref_ptr(ndr));
- if (**r->in.data == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (**r->in.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_ref_ptr(ndr));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, ***r->in.data));
}
diff --git a/source/librpc/gen_ndr/ndr_epmapper.c
b/source/librpc/gen_ndr/ndr_epmapper.c
index 43e26e8..3ca7162 100644
--- a/source/librpc/gen_ndr/ndr_epmapper.c
+++ b/source/librpc/gen_ndr/ndr_epmapper.c
@@ -1962,14 +1962,20 @@ static NTSTATUS ndr_push_epm_Lookup(struct ndr_push
*ndr, int flags, const struc
NDR_CHECK(ndr_push_rpc_if_id_t(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.interface_id));
}
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.vers_option));
- if (r->in.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.entry_handle));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_ents));
}
if (flags & NDR_OUT) {
- if (r->out.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.entry_handle));
- if (r->out.num_ents == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.num_ents == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.num_ents));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_ents));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -2150,14 +2156,20 @@ _PUBLIC_ NTSTATUS ndr_push_epm_Map(struct ndr_push
*ndr, int flags, const struct
if (r->in.map_tower) {
NDR_CHECK(ndr_push_epm_twr_t(ndr, NDR_SCALARS,
r->in.map_tower));
}
- if (r->in.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.entry_handle));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_towers));
}
if (flags & NDR_OUT) {
- if (r->out.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.entry_handle));
- if (r->out.num_towers == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.num_towers == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
*r->out.num_towers));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_towers));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
@@ -2325,11 +2337,15 @@ _PUBLIC_ void ndr_print_epm_Map(struct ndr_print *ndr,
const char *name, int fla
static NTSTATUS ndr_push_epm_LookupHandleFree(struct ndr_push *ndr, int flags,
const struct epm_LookupHandleFree *r)
{
if (flags & NDR_IN) {
- if (r->in.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.entry_handle));
}
if (flags & NDR_OUT) {
- if (r->out.entry_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.entry_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.entry_handle));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->out.result));
}
@@ -2397,7 +2413,9 @@ _PUBLIC_ void ndr_print_epm_LookupHandleFree(struct
ndr_print *ndr, const char *
static NTSTATUS ndr_push_epm_InqObject(struct ndr_push *ndr, int flags, const
struct epm_InqObject *r)
{
if (flags & NDR_IN) {
- if (r->in.epm_object == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.epm_object == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_GUID(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.epm_object));
}
if (flags & NDR_OUT) {
diff --git a/source/librpc/gen_ndr/ndr_eventlog.c
b/source/librpc/gen_ndr/ndr_eventlog.c
index 42a846c..7b4f701 100644
--- a/source/librpc/gen_ndr/ndr_eventlog.c
+++ b/source/librpc/gen_ndr/ndr_eventlog.c
@@ -190,7 +190,9 @@ _PUBLIC_ void ndr_print_eventlog_Record(struct ndr_print
*ndr, const char *name,
static NTSTATUS ndr_push_eventlog_ClearEventLogW(struct ndr_push *ndr, int
flags, const struct eventlog_ClearEventLogW *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.unknown));
if (r->in.unknown) {
@@ -310,11 +312,15 @@ _PUBLIC_ void ndr_print_eventlog_BackupEventLogW(struct
ndr_print *ndr, const ch
static NTSTATUS ndr_push_eventlog_CloseEventLog(struct ndr_push *ndr, int
flags, const struct eventlog_CloseEventLog *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
}
if (flags & NDR_OUT) {
- if (r->out.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.handle));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -423,11 +429,15 @@ _PUBLIC_ void
ndr_print_eventlog_DeregisterEventSource(struct ndr_print *ndr, co
static NTSTATUS ndr_push_eventlog_GetNumRecords(struct ndr_push *ndr, int
flags, const struct eventlog_GetNumRecords *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
}
if (flags & NDR_OUT) {
- if (r->out.number == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.number == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.number));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -588,7 +598,9 @@ static NTSTATUS ndr_push_eventlog_OpenEventLogW(struct
ndr_push *ndr, int flags,
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown3));
}
if (flags & NDR_OUT) {
- if (r->out.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.handle));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -755,19 +767,27 @@ _PUBLIC_ void
ndr_print_eventlog_OpenBackupEventLogW(struct ndr_print *ndr, cons
static NTSTATUS ndr_push_eventlog_ReadEventLogW(struct ndr_push *ndr, int
flags, const struct eventlog_ReadEventLogW *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offset));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->in.number_of_bytes));
}
if (flags & NDR_OUT) {
- if (r->out.data == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.data == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
r->in.number_of_bytes));
NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data,
r->in.number_of_bytes));
- if (r->out.sent_size == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.sent_size == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.sent_size));
- if (r->out.real_size == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.real_size == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.real_size));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -1362,7 +1382,9 @@ _PUBLIC_ void ndr_print_eventlog_GetLogIntormation(struct
ndr_print *ndr, const
static NTSTATUS ndr_push_eventlog_FlushEventLog(struct ndr_push *ndr, int
flags, const struct eventlog_FlushEventLog *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
}
if (flags & NDR_OUT) {
diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index 2b830ae..12e1ea5 100644
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -3995,11 +3995,15 @@ _PUBLIC_ void ndr_print_lsa_TransSidArray3(struct
ndr_print *ndr, const char *na
static NTSTATUS ndr_push_lsa_Close(struct ndr_push *ndr, int flags, const
struct lsa_Close *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
}
if (flags & NDR_OUT) {
- if (r->out.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.handle));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -4067,7 +4071,9 @@ _PUBLIC_ void ndr_print_lsa_Close(struct ndr_print *ndr,
const char *name, int f
static NTSTATUS ndr_push_lsa_Delete(struct ndr_push *ndr, int flags, const
struct lsa_Delete *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
}
if (flags & NDR_OUT) {
@@ -4122,16 +4128,24 @@ _PUBLIC_ void ndr_print_lsa_Delete(struct ndr_print
*ndr, const char *name, int
static NTSTATUS ndr_push_lsa_EnumPrivs(struct ndr_push *ndr, int flags, const
struct lsa_EnumPrivs *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
- if (r->in.resume_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.resume_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
*r->in.resume_handle));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.max_count));
}
if (flags & NDR_OUT) {
- if (r->out.resume_handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.resume_handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
*r->out.resume_handle));
- if (r->out.privs == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.privs == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_lsa_PrivArray(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.privs));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -4227,7 +4241,9 @@ _PUBLIC_ void ndr_print_lsa_EnumPrivs(struct ndr_print
*ndr, const char *name, i
static NTSTATUS ndr_push_lsa_QuerySecurity(struct ndr_push *ndr, int flags,
const struct lsa_QuerySecurity *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
NDR_CHECK(ndr_push_security_secinfo(ndr, NDR_SCALARS,
r->in.sec_info));
}
@@ -4397,12 +4413,16 @@ static NTSTATUS ndr_push_lsa_OpenPolicy(struct ndr_push
*ndr, int flags, const s
if (r->in.system_name) {
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS,
*r->in.system_name));
}
- if (r->in.attr == NULL) return NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.attr == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_lsa_ObjectAttribute(ndr,
NDR_SCALARS|NDR_BUFFERS, r->in.attr));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.access_mask));
}
if (flags & NDR_OUT) {
- if (r->out.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->out.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->out.handle));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
@@ -4493,7 +4513,9 @@ _PUBLIC_ void ndr_print_lsa_OpenPolicy(struct ndr_print
*ndr, const char *name,
static NTSTATUS ndr_push_lsa_QueryInfoPolicy(struct ndr_push *ndr, int flags,
const struct lsa_QueryInfoPolicy *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
+ if (r->in.handle == NULL) {
+ return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
+ }
NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS,
r->in.handle));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->in.level));
}
@@ -4662,14 +4684,20 @@ _PUBLIC_ void ndr_print_lsa_ClearAuditLog(struct
ndr_print *ndr, const char *nam
static NTSTATUS ndr_push_lsa_CreateAccount(struct ndr_push *ndr, int flags,
const struct lsa_CreateAccount *r)
{
if (flags & NDR_IN) {
- if (r->in.handle == NULL) return
NT_STATUS_INVALID_PARAMETER_MIX;
--
Samba Shared Repository
