The branch, master has been updated
via 44ae09b82e509db390ad4e884ae3310a3508cf46 (commit)
via 4a40857836ef2678d2e55c2b1cc9745b88812c4e (commit)
via 142b2a61f8a77b3065ce4c78b459ab714d6d190a (commit)
from 6d300399b52e0921ce205ef2f053b722b21edeeb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 44ae09b82e509db390ad4e884ae3310a3508cf46
Author: Tim Prouty <[email protected]>
Date: Sat Jan 17 15:19:08 2009 -0800
librpc: Re-run make idl_full
commit 4a40857836ef2678d2e55c2b1cc9745b88812c4e
Author: Tim Prouty <[email protected]>
Date: Sat Jan 17 14:42:20 2009 -0800
librpc: Remove usage of max and replace with improved range.
commit 142b2a61f8a77b3065ce4c78b459ab714d6d190a
Author: Tim Prouty <[email protected]>
Date: Sat Jan 17 14:40:12 2009 -0800
pidl: Remove "max" and make "range" smarter about unsigned types
This eliminates a warning in pidl generated code, while preserving
cross-platform idl compatibility.
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/eventlog.h | 2 +-
librpc/gen_ndr/ndr_drsuapi.c | 48 +++++++++++++++---------------
librpc/gen_ndr/ndr_eventlog.c | 2 +-
librpc/gen_ndr/ndr_lsa.c | 34 ++++++++++----------
librpc/gen_ndr/ndr_netlogon.c | 4 +-
librpc/gen_ndr/ndr_samr.c | 6 ++--
librpc/gen_ndr/ndr_security.c | 4 +-
librpc/gen_ndr/ndr_svcctl.c | 40 ++++++++++++------------
librpc/idl/eventlog.idl | 2 +-
pidl/lib/Parse/Pidl/Compat.pm | 1 -
pidl/lib/Parse/Pidl/NDR.pm | 1 -
pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 16 +++++----
pidl/lib/Parse/Pidl/Typelist.pm | 15 +++++++++-
13 files changed, 94 insertions(+), 81 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h
index 65178d2..9c9a2ed 100644
--- a/librpc/gen_ndr/eventlog.h
+++ b/librpc/gen_ndr/eventlog.h
@@ -47,7 +47,7 @@ struct eventlog_Record {
time_t time_written;
uint32_t event_id;
enum eventlogEventTypes event_type;
- uint16_t num_of_strings;/* [max(256)] */
+ uint16_t num_of_strings;/* [range(0,256)] */
uint16_t event_category;
uint16_t reserved_flags;
uint32_t closing_record_number;
diff --git a/librpc/gen_ndr/ndr_drsuapi.c b/librpc/gen_ndr/ndr_drsuapi.c
index 369a1d4..336f56f 100644
--- a/librpc/gen_ndr/ndr_drsuapi.c
+++ b/librpc/gen_ndr/ndr_drsuapi.c
@@ -811,7 +811,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsReplicaCursorCtrEx(struct ndr_pull *
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved1));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 0x100000) {
+ if (r->count > 0x100000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved2));
@@ -1166,7 +1166,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_drsuapi_DsReplicaOIDMapping_Ctr(struct ndr_p
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_mappings));
- if (r->num_mappings < 0 || r->num_mappings > 0x100000) {
+ if (r->num_mappings > 0x100000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_mappings));
@@ -1700,7 +1700,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsReplicaCursor2CtrEx(struct ndr_pull
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->version));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved1));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 0x100000) {
+ if (r->count > 0x100000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved2));
@@ -1764,7 +1764,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsAttributeValue(struct ndr_pull *ndr,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->__ndr_size));
- if (r->__ndr_size < 0 || r->__ndr_size > 10485760) {
+ if (r->__ndr_size > 10485760) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_blob));
@@ -1830,7 +1830,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsAttributeValueCtr(struct ndr_pull *n
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_values));
- if (r->num_values < 0 || r->num_values > 10485760) {
+ if (r->num_values > 10485760) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_values));
@@ -2074,7 +2074,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsReplicaAttributeCtr(struct ndr_pull
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->num_attributes));
- if (r->num_attributes < 0 || r->num_attributes > 1048576) {
+ if (r->num_attributes > 1048576) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_attributes));
@@ -2278,7 +2278,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_drsuapi_DsReplicaMetaDataCtr(struct ndr_pull
NDR_CHECK(ndr_pull_array_size(ndr, &r->meta_data));
NDR_CHECK(ndr_pull_align(ndr, 8));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1048576) {
+ if (r->count > 1048576) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_PULL_ALLOC_N(ndr, r->meta_data, ndr_get_array_size(ndr,
&r->meta_data));
@@ -2710,7 +2710,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_drsuapi_DsGetNCChangesCtr6(struct ndr_pull *
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->nc_object_count));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->nc_linked_attributes_count));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->linked_attributes_count));
- if (r->linked_attributes_count < 0 ||
r->linked_attributes_count > 1048576) {
+ if (r->linked_attributes_count > 1048576) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_linked_attributes));
@@ -3837,11 +3837,11 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetMembershipsCtr1(struct ndr_pull *
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->status));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->num_memberships));
- if (r->num_memberships < 0 || r->num_memberships > 10000) {
+ if (r->num_memberships > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids));
- if (r->num_sids < 0 || r->num_sids > 10000) {
+ if (r->num_sids > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info_array));
@@ -4324,7 +4324,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetNT4ChangeLogRequest1(struct ndr_p
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown2));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
- if (r->length < 0 || r->length > 0x00A00000) {
+ if (r->length > 0x00A00000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -4479,11 +4479,11 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetNT4ChangeLogInfo1(struct ndr_pull
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 8));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length1));
- if (r->length1 < 0 || r->length1 > 0x00A00000) {
+ if (r->length1 > 0x00A00000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length2));
- if (r->length2 < 0 || r->length2 > 0x00A00000) {
+ if (r->length2 > 0x00A00000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->unknown1));
@@ -5320,7 +5320,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsWriteAccountSpnRequest1(struct ndr_p
r->object_dn = NULL;
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_spn_names));
@@ -6217,7 +6217,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetDCInfoCtr1(struct ndr_pull *ndr,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -6585,7 +6585,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetDCInfoCtr2(struct ndr_pull *ndr,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -6956,7 +6956,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetDCInfoCtr3(struct ndr_pull *ndr,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -7133,7 +7133,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsGetDCConnectionCtr01(struct ndr_pull
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_array));
@@ -7537,7 +7537,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsAddEntryExtraErrorBuffer(struct ndr_
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
- if (r->size < 0 || r->size > 10485760) {
+ if (r->size > 10485760) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -8097,7 +8097,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsAddEntryCtr2(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
NDR_CHECK(ndr_pull_drsuapi_DsAddEntryErrorInfoX(ndr,
NDR_SCALARS, &r->error));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_objects));
@@ -8227,7 +8227,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsAddEntryCtr3(struct ndr_pull *ndr, i
r->error = NULL;
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_objects));
@@ -10709,7 +10709,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsReplicaConnection04Ctr(struct ndr_pu
NDR_CHECK(ndr_pull_array_size(ndr, &r->array));
NDR_CHECK(ndr_pull_align(ndr, 8));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 10000) {
+ if (r->count > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
@@ -10858,7 +10858,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_DsReplica06Ctr(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_array_size(ndr, &r->array));
NDR_CHECK(ndr_pull_align(ndr, 8));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 256) {
+ if (r->count > 256) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reserved));
@@ -11863,7 +11863,7 @@ static enum ndr_err_code
ndr_pull_drsuapi_QuerySitesByCostCtr1(struct ndr_pull *
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_info));
- if (r->num_info < 0 || r->num_info > 10000) {
+ if (r->num_info > 10000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_info));
diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c
index edcdf2e..ddc93f9 100644
--- a/librpc/gen_ndr/ndr_eventlog.c
+++ b/librpc/gen_ndr/ndr_eventlog.c
@@ -974,7 +974,7 @@ static enum ndr_err_code
ndr_pull_eventlog_ReadEventLogW(struct ndr_pull *ndr, i
NDR_CHECK(ndr_pull_eventlogReadFlags(ndr, NDR_SCALARS,
&r->in.flags));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offset));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->in.number_of_bytes));
- if (r->in.number_of_bytes < 0 || r->in.number_of_bytes >
0x7FFFF) {
+ if (r->in.number_of_bytes > 0x7FFFF) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_PULL_ALLOC_N(ndr, r->out.data, r->in.number_of_bytes);
diff --git a/librpc/gen_ndr/ndr_lsa.c b/librpc/gen_ndr/ndr_lsa.c
index 9169adf..793404a 100644
--- a/librpc/gen_ndr/ndr_lsa.c
+++ b/librpc/gen_ndr/ndr_lsa.c
@@ -1819,7 +1819,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_lsa_SidArray(struct
ndr_pull *ndr, int ndr_f
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_sids));
- if (r->num_sids < 0 || r->num_sids > 1000) {
+ if (r->num_sids > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -2060,7 +2060,7 @@ static enum ndr_err_code
ndr_pull_lsa_TransSidArray(struct ndr_pull *ndr, int nd
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -2147,7 +2147,7 @@ static enum ndr_err_code
ndr_pull_lsa_RefDomainList(struct ndr_pull *ndr, int nd
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_domains));
@@ -2306,7 +2306,7 @@ static enum ndr_err_code
ndr_pull_lsa_TransNameArray(struct ndr_pull *ndr, int n
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -2422,7 +2422,7 @@ static enum ndr_err_code ndr_pull_lsa_PrivilegeSet(struct
ndr_pull *ndr, int ndr
NDR_CHECK(ndr_pull_array_size(ndr, &r->set));
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown));
@@ -2580,7 +2580,7 @@ static enum ndr_err_code ndr_pull_lsa_DATA_BUF2(struct
ndr_pull *ndr, int ndr_fl
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->size));
- if (r->size < 0 || r->size > 65536) {
+ if (r->size > 65536) {
return ndr_pull_error(ndr, NDR_ERR_RANGE,
"value out of range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -3924,7 +3924,7 @@ static enum ndr_err_code ndr_pull_lsa_RightSet(struct
ndr_pull *ndr, int ndr_fla
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 256) {
+ if (r->count > 256) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -4338,7 +4338,7 @@ static enum ndr_err_code
ndr_pull_lsa_TransNameArray2(struct ndr_pull *ndr, int
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_names));
@@ -4463,7 +4463,7 @@ static enum ndr_err_code
ndr_pull_lsa_TransSidArray2(struct ndr_pull *ndr, int n
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -4609,7 +4609,7 @@ static enum ndr_err_code
ndr_pull_lsa_TransSidArray3(struct ndr_pull *ndr, int n
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1000) {
+ if (r->count > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sids));
@@ -4690,7 +4690,7 @@ static enum ndr_err_code
ndr_pull_lsa_ForestTrustBinaryData(struct ndr_pull *ndr
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->length));
- if (r->length < 0 || r->length > 131072) {
+ if (r->length > 131072) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
@@ -5021,7 +5021,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_lsa_ForestTrustInformation(struct ndr_pull *
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 4000) {
+ if (r->count > 4000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_entries));
@@ -6032,7 +6032,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_lsa_EnumAccounts(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
r->in.resume_handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_resume_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->in.num_entries));
- if (r->in.num_entries < 0 || r->in.num_entries > 8192) {
+ if (r->in.num_entries > 8192) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_PULL_ALLOC(ndr, r->out.resume_handle);
@@ -6375,7 +6375,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_lsa_LookupNames(struct ndr_pull *ndr, int fl
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS,
r->in.handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
- if (r->in.num_names < 0 || r->in.num_names > 1000) {
+ if (r->in.num_names > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -10842,7 +10842,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_lsa_LookupNames2(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS,
r->in.handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
- if (r->in.num_names < 0 || r->in.num_names > 1000) {
+ if (r->in.num_names > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -11496,7 +11496,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_lsa_LookupNames3(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS,
r->in.handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
- if (r->in.num_names < 0 || r->in.num_names > 1000) {
+ if (r->in.num_names > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -12234,7 +12234,7 @@ static enum ndr_err_code
ndr_pull_lsa_LookupNames4(struct ndr_pull *ndr, int fla
ZERO_STRUCT(r->out);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
- if (r->in.num_names < 0 || r->in.num_names > 1000) {
+ if (r->in.num_names > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c
index 050ee24..751967a 100644
--- a/librpc/gen_ndr/ndr_netlogon.c
+++ b/librpc/gen_ndr/ndr_netlogon.c
@@ -13751,7 +13751,7 @@ static enum ndr_err_code
ndr_pull_netr_DsRAddressToSitenamesW(struct ndr_pull *n
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_name_0, 0);
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.count));
- if (r->in.count < 0 || r->in.count > 32000) {
+ if (r->in.count > 32000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.addresses));
@@ -14294,7 +14294,7 @@ static enum ndr_err_code
ndr_pull_netr_DsRAddressToSitenamesExW(struct ndr_pull
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_server_name_0, 0);
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.count));
- if (r->in.count < 0 || r->in.count > 32000) {
+ if (r->in.count > 32000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.addresses));
diff --git a/librpc/gen_ndr/ndr_samr.c b/librpc/gen_ndr/ndr_samr.c
index 83b0916..33c70ce 100644
--- a/librpc/gen_ndr/ndr_samr.c
+++ b/librpc/gen_ndr/ndr_samr.c
@@ -1191,7 +1191,7 @@ static enum ndr_err_code ndr_pull_samr_Ids(struct
ndr_pull *ndr, int ndr_flags,
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->count));
- if (r->count < 0 || r->count > 1024) {
+ if (r->count > 1024) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_ids));
@@ -7211,7 +7211,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_samr_LookupNames(struct ndr_pull *ndr, int f
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS,
r->in.domain_handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_names));
- if (r->in.num_names < 0 || r->in.num_names > 1000) {
+ if (r->in.num_names > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.names));
@@ -7353,7 +7353,7 @@ static enum ndr_err_code ndr_pull_samr_LookupRids(struct
ndr_pull *ndr, int flag
NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS,
r->in.domain_handle));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.num_rids));
- if (r->in.num_rids < 0 || r->in.num_rids > 1000) {
+ if (r->in.num_rids > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_array_size(ndr, &r->in.rids));
diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index 64c134d..c227170 100644
--- a/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
@@ -498,7 +498,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_acl(struct
ndr_pull *ndr, int ndr_f
NDR_CHECK(ndr_pull_security_acl_revision(ndr, NDR_SCALARS,
&r->revision));
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_aces));
- if (r->num_aces < 0 || r->num_aces > 1000) {
+ if (r->num_aces > 1000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_PULL_ALLOC_N(ndr, r->aces, r->num_aces);
@@ -797,7 +797,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_sec_desc_buf(struct
ndr_pull *ndr, int ndr_f
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->sd_size));
- if (r->sd_size < 0 || r->sd_size > 0x40000) {
+ if (r->sd_size > 0x40000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sd));
diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c
index 72fee1a..fc59371 100644
--- a/librpc/gen_ndr/ndr_svcctl.c
+++ b/librpc/gen_ndr/ndr_svcctl.c
@@ -1164,7 +1164,7 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr
ndr->flags = _flags_save_string;
}
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->num_actions));
- if (r->num_actions < 0 || r->num_actions > 1024) {
+ if (r->num_actions > 1024) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_actions));
@@ -1627,7 +1627,7 @@ static enum ndr_err_code
ndr_pull_svcctl_QueryServiceObjectSecurity(struct ndr_p
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->in.security_flags));
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS,
&r->in.buffer_size));
- if (r->in.buffer_size < 0 || r->in.buffer_size > 0x40000) {
+ if (r->in.buffer_size > 0x40000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
NDR_PULL_ALLOC_N(ndr, r->out.buffer, r->in.buffer_size);
@@ -1647,7 +1647,7 @@ static enum ndr_err_code
ndr_pull_svcctl_QueryServiceObjectSecurity(struct ndr_p
_mem_save_needed_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.needed, LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.needed));
- if (*r->out.needed < 0 || *r->out.needed > 0x40000) {
+ if (*r->out.needed > 0x40000) {
return ndr_pull_error(ndr, NDR_ERR_RANGE, "value out of
range");
}
--
Samba Shared Repository
