mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
Import changes from upstream libndr.
This commit is contained in:
Jelmer Vernooij
parent
de0aa7850c
commit
e779345bca
@ -3758,8 +3758,6 @@ NTSTATUS rpc_wkssvc_init(void);
|
||||
_PUBLIC_ size_t ndr_align_size(uint32_t offset, size_t n);
|
||||
_PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience);
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t size);
|
||||
_PUBLIC_ void ndr_pull_save(struct ndr_pull *ndr, struct ndr_pull_save *save);
|
||||
_PUBLIC_ void ndr_pull_restore(struct ndr_pull *ndr, struct ndr_pull_save *save);
|
||||
_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience);
|
||||
_PUBLIC_ DATA_BLOB ndr_push_blob(struct ndr_push *ndr);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size);
|
||||
@ -3822,13 +3820,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CT
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
void *p, ndr_pull_flags_fn_t fn);
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn);
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, const void *p, ndr_push_flags_fn_t fn);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
uint32_t level, ndr_push_flags_fn_t fn);
|
||||
_PUBLIC_ size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t push);
|
||||
_PUBLIC_ size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_push_flags_fn_t push);
|
||||
_PUBLIC_ uint32_t ndr_push_get_relative_base_offset(struct ndr_push *ndr);
|
||||
@ -3884,8 +3876,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_align(struct ndr_pull *ndr, size_t size);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_bytes(struct ndr_push *ndr, const uint8_t *data, uint32_t n);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_zero(struct ndr_push *ndr, uint32_t n);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n);
|
||||
_PUBLIC_ void ndr_push_save(struct ndr_push *ndr, struct ndr_push_save *save);
|
||||
_PUBLIC_ void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_unique_ptr(struct ndr_push *ndr, const void *p);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_full_ptr(struct ndr_push *ndr, const void *p);
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_ref_ptr(struct ndr_push *ndr);
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
rpc interface definitions
|
||||
|
||||
Copyright (C) Andrew Tridgell 2003
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
@ -53,6 +54,8 @@ struct ndr_pull {
|
||||
uint32_t data_size;
|
||||
uint32_t offset;
|
||||
|
||||
struct smb_iconv_convenience *iconv_convenience;
|
||||
|
||||
uint32_t relative_base_offset;
|
||||
struct ndr_token_list *relative_base_list;
|
||||
|
||||
@ -68,12 +71,6 @@ struct ndr_pull {
|
||||
uint32_t ptr_count;
|
||||
};
|
||||
|
||||
struct ndr_pull_save {
|
||||
uint32_t data_size;
|
||||
uint32_t offset;
|
||||
struct ndr_pull_save *next;
|
||||
};
|
||||
|
||||
/* structure passed to functions that generate NDR formatted data */
|
||||
struct ndr_push {
|
||||
uint32_t flags; /* LIBNDR_FLAG_* */
|
||||
@ -91,14 +88,10 @@ struct ndr_push {
|
||||
|
||||
/* this is used to ensure we generate unique reference IDs */
|
||||
uint32_t ptr_count;
|
||||
};
|
||||
|
||||
struct ndr_push_save {
|
||||
uint32_t offset;
|
||||
struct ndr_push_save *next;
|
||||
struct smb_iconv_convenience *iconv_convenience;
|
||||
};
|
||||
|
||||
|
||||
/* structure passed to functions that print IDL structures */
|
||||
struct ndr_print {
|
||||
uint32_t flags; /* LIBNDR_FLAG_* */
|
||||
@ -118,11 +111,9 @@ struct ndr_print {
|
||||
#define LIBNDR_FLAG_STR_NULLTERM (1<<6)
|
||||
#define LIBNDR_FLAG_STR_SIZE2 (1<<7)
|
||||
#define LIBNDR_FLAG_STR_BYTESIZE (1<<8)
|
||||
#define LIBNDR_FLAG_STR_FIXLEN32 (1<<9)
|
||||
#define LIBNDR_FLAG_STR_CONFORMANT (1<<10)
|
||||
#define LIBNDR_FLAG_STR_CHARLEN (1<<11)
|
||||
#define LIBNDR_FLAG_STR_UTF8 (1<<12)
|
||||
#define LIBNDR_FLAG_STR_FIXLEN15 (1<<13)
|
||||
#define LIBNDR_STRING_FLAGS (0x7FFC)
|
||||
|
||||
|
||||
@ -149,7 +140,7 @@ struct ndr_print {
|
||||
/* set to avoid recursion in ndr_size_*() calculation */
|
||||
#define LIBNDR_FLAG_NO_NDR_SIZE (1<<31)
|
||||
|
||||
/* useful macro for debugging with DEBUG */
|
||||
/* useful macro for debugging */
|
||||
#define NDR_PRINT_DEBUG(type, p) ndr_print_debug((ndr_print_fn_t)ndr_print_ ##type, #p, p)
|
||||
#define NDR_PRINT_UNION_DEBUG(type, level, p) ndr_print_union_debug((ndr_print_fn_t)ndr_print_ ##type, #p, level, p)
|
||||
#define NDR_PRINT_FUNCTION_DEBUG(type, flags, p) ndr_print_function_debug((ndr_print_function_t)ndr_print_ ##type, #type, flags, p)
|
||||
@ -337,18 +328,182 @@ struct ndr_interface_list {
|
||||
const struct ndr_interface_table *table;
|
||||
};
|
||||
|
||||
/* FIXME: Use represent_as instead */
|
||||
struct dom_sid;
|
||||
enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_pull_dom_sid2(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
void ndr_print_dom_sid2(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_push_dom_sid28(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_pull_dom_sid28(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags);
|
||||
enum ndr_err_code ndr_push_dom_sid0(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid);
|
||||
enum ndr_err_code ndr_pull_dom_sid0(struct ndr_pull *ndr, int ndr_flags, struct dom_sid *sid);
|
||||
void ndr_print_dom_sid0(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
size_t ndr_size_dom_sid0(const struct dom_sid *sid, int flags);
|
||||
void ndr_print_ipv4_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip);
|
||||
void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid);
|
||||
bool ndr_syntax_id_equal(const struct ndr_syntax_id *i1, const struct ndr_syntax_id *i2);
|
||||
enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, const void *p, ndr_push_flags_fn_t fn);
|
||||
enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p, uint32_t level, ndr_push_flags_fn_t fn);
|
||||
size_t ndr_size_struct(const void *p, int flags, ndr_push_flags_fn_t push);
|
||||
size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_push_flags_fn_t push);
|
||||
uint32_t ndr_push_get_relative_base_offset(struct ndr_push *ndr);
|
||||
void ndr_push_restore_relative_base_offset(struct ndr_push *ndr, uint32_t offset);
|
||||
enum ndr_err_code ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, const void *p, uint32_t offset);
|
||||
enum ndr_err_code ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p);
|
||||
enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p);
|
||||
enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p);
|
||||
uint32_t ndr_pull_get_relative_base_offset(struct ndr_pull *ndr);
|
||||
void ndr_pull_restore_relative_base_offset(struct ndr_pull *ndr, uint32_t offset);
|
||||
enum ndr_err_code ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, const void *p, uint32_t offset);
|
||||
enum ndr_err_code ndr_pull_setup_relative_base_offset2(struct ndr_pull *ndr, const void *p);
|
||||
enum ndr_err_code ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset);
|
||||
enum ndr_err_code ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p);
|
||||
size_t ndr_align_size(uint32_t offset, size_t n);
|
||||
struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience);
|
||||
enum ndr_err_code ndr_pull_advance(struct ndr_pull *ndr, uint32_t size);
|
||||
struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience);
|
||||
DATA_BLOB ndr_push_blob(struct ndr_push *ndr);
|
||||
enum ndr_err_code ndr_push_expand(struct ndr_push *ndr, uint32_t extra_size);
|
||||
void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
|
||||
void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
|
||||
void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr);
|
||||
void ndr_print_union_debug(ndr_print_fn_t fn, const char *name, uint32_t level, void *ptr);
|
||||
void ndr_print_function_debug(ndr_print_function_t fn, const char *name, int flags, void *ptr);
|
||||
char *ndr_print_struct_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, const char *name, void *ptr);
|
||||
char *ndr_print_union_string(TALLOC_CTX *mem_ctx, ndr_print_fn_t fn, const char *name, uint32_t level, void *ptr);
|
||||
char *ndr_print_function_string(TALLOC_CTX *mem_ctx,
|
||||
ndr_print_function_t fn, const char *name,
|
||||
int flags, void *ptr);
|
||||
void ndr_set_flags(uint32_t *pflags, uint32_t new_flags);
|
||||
enum ndr_err_code ndr_pull_error(struct ndr_pull *ndr,
|
||||
enum ndr_err_code ndr_err,
|
||||
const char *format, ...) PRINTF_ATTRIBUTE(3,4);
|
||||
enum ndr_err_code ndr_push_error(struct ndr_push *ndr,
|
||||
enum ndr_err_code ndr_err,
|
||||
const char *format, ...) PRINTF_ATTRIBUTE(3,4);
|
||||
enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
struct ndr_pull **_subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is);
|
||||
enum ndr_err_code ndr_pull_subcontext_end(struct ndr_pull *ndr,
|
||||
struct ndr_pull *subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is);
|
||||
enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr,
|
||||
struct ndr_push **_subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is);
|
||||
enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
struct ndr_push *subndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is);
|
||||
enum ndr_err_code ndr_token_store(TALLOC_CTX *mem_ctx,
|
||||
struct ndr_token_list **list,
|
||||
const void *key,
|
||||
uint32_t value);
|
||||
enum ndr_err_code ndr_token_retrieve_cmp_fn(struct ndr_token_list **list, const void *key, uint32_t *v, comparison_fn_t _cmp_fn, bool _remove_tok);
|
||||
enum ndr_err_code ndr_token_retrieve(struct ndr_token_list **list, const void *key, uint32_t *v);
|
||||
uint32_t ndr_token_peek(struct ndr_token_list **list, const void *key);
|
||||
enum ndr_err_code ndr_pull_array_size(struct ndr_pull *ndr, const void *p);
|
||||
uint32_t ndr_get_array_size(struct ndr_pull *ndr, const void *p);
|
||||
enum ndr_err_code ndr_check_array_size(struct ndr_pull *ndr, void *p, uint32_t size);
|
||||
enum ndr_err_code ndr_pull_array_length(struct ndr_pull *ndr, const void *p);
|
||||
uint32_t ndr_get_array_length(struct ndr_pull *ndr, const void *p);
|
||||
enum ndr_err_code ndr_check_array_length(struct ndr_pull *ndr, void *p, uint32_t length);
|
||||
enum ndr_err_code ndr_push_set_switch_value(struct ndr_push *ndr, const void *p, uint32_t val);
|
||||
enum ndr_err_code ndr_pull_set_switch_value(struct ndr_pull *ndr, const void *p, uint32_t val);
|
||||
enum ndr_err_code ndr_print_set_switch_value(struct ndr_print *ndr, const void *p, uint32_t val);
|
||||
uint32_t ndr_push_get_switch_value(struct ndr_push *ndr, const void *p);
|
||||
uint32_t ndr_pull_get_switch_value(struct ndr_pull *ndr, const void *p);
|
||||
uint32_t ndr_print_get_switch_value(struct ndr_print *ndr, const void *p);
|
||||
enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p, ndr_pull_flags_fn_t fn);
|
||||
enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p, ndr_pull_flags_fn_t fn);
|
||||
enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p, uint32_t level, ndr_pull_flags_fn_t fn);
|
||||
|
||||
/* from libndr_basic.h */
|
||||
#define NDR_SCALAR_PROTO(name, type) \
|
||||
enum ndr_err_code ndr_push_ ## name(struct ndr_push *ndr, int ndr_flags, type v); \
|
||||
enum ndr_err_code ndr_pull_ ## name(struct ndr_pull *ndr, int ndr_flags, type *v); \
|
||||
void ndr_print_ ## name(struct ndr_print *ndr, const char *var_name, type v);
|
||||
void ndr_print_ ## name(struct ndr_print *ndr, const char *var_name, type v);
|
||||
|
||||
#define NDR_BUFFER_PROTO(name, type) \
|
||||
enum ndr_err_code ndr_push_ ## name(struct ndr_push *ndr, int ndr_flags, const type *v); \
|
||||
enum ndr_err_code ndr_pull_ ## name(struct ndr_pull *ndr, int ndr_flags, type *v); \
|
||||
void ndr_print_ ## name(struct ndr_print *ndr, const char *var_name, const type *v);
|
||||
void ndr_print_ ## name(struct ndr_print *ndr, const char *var_name, const type *v);
|
||||
|
||||
NDR_SCALAR_PROTO(uint8, uint8_t)
|
||||
NDR_SCALAR_PROTO(int8, int8_t)
|
||||
NDR_SCALAR_PROTO(uint16, uint16_t)
|
||||
NDR_SCALAR_PROTO(int16, int16_t)
|
||||
NDR_SCALAR_PROTO(uint32, uint32_t)
|
||||
NDR_SCALAR_PROTO(int32, int32_t)
|
||||
NDR_SCALAR_PROTO(udlong, uint64_t)
|
||||
NDR_SCALAR_PROTO(udlongr, uint64_t)
|
||||
NDR_SCALAR_PROTO(dlong, int64_t)
|
||||
NDR_SCALAR_PROTO(hyper, uint64_t)
|
||||
NDR_SCALAR_PROTO(pointer, void *)
|
||||
NDR_SCALAR_PROTO(time_t, time_t)
|
||||
NDR_SCALAR_PROTO(NTSTATUS, NTSTATUS)
|
||||
NDR_SCALAR_PROTO(WERROR, WERROR)
|
||||
NDR_SCALAR_PROTO(NTTIME, NTTIME)
|
||||
NDR_SCALAR_PROTO(NTTIME_1sec, NTTIME)
|
||||
NDR_SCALAR_PROTO(NTTIME_hyper, NTTIME)
|
||||
NDR_SCALAR_PROTO(DATA_BLOB, DATA_BLOB)
|
||||
NDR_SCALAR_PROTO(ipv4address, const char *)
|
||||
NDR_SCALAR_PROTO(string, const char *)
|
||||
|
||||
void ndr_print_dom_sid28(struct ndr_print *ndr, const char *name, const struct dom_sid *sid);
|
||||
size_t ndr_size_dom_sid28(const struct dom_sid *sid, int flags);
|
||||
enum ndr_err_code ndr_pull_policy_handle(struct ndr_pull *ndr, int ndr_flags, struct policy_handle *r);
|
||||
enum ndr_err_code ndr_push_policy_handle(struct ndr_push *ndr, int ndr_flags, const struct policy_handle *r);
|
||||
void ndr_print_policy_handle(struct ndr_print *ndr, const char *name, const struct policy_handle *r);
|
||||
bool policy_handle_empty(struct policy_handle *h);
|
||||
|
||||
void ndr_check_padding(struct ndr_pull *ndr, size_t n);
|
||||
enum ndr_err_code ndr_pull_generic_ptr(struct ndr_pull *ndr, uint32_t *v);
|
||||
enum ndr_err_code ndr_pull_ref_ptr(struct ndr_pull *ndr, uint32_t *v);
|
||||
enum ndr_err_code ndr_pull_bytes(struct ndr_pull *ndr, uint8_t *data, uint32_t n);
|
||||
enum ndr_err_code ndr_pull_array_uint8(struct ndr_pull *ndr, int ndr_flags, uint8_t *data, uint32_t n);
|
||||
enum ndr_err_code ndr_push_align(struct ndr_push *ndr, size_t size);
|
||||
enum ndr_err_code ndr_pull_align(struct ndr_pull *ndr, size_t size);
|
||||
enum ndr_err_code ndr_push_bytes(struct ndr_push *ndr, const uint8_t *data, uint32_t n);
|
||||
enum ndr_err_code ndr_push_zero(struct ndr_push *ndr, uint32_t n);
|
||||
enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_flags, const uint8_t *data, uint32_t n);
|
||||
enum ndr_err_code ndr_push_unique_ptr(struct ndr_push *ndr, const void *p);
|
||||
enum ndr_err_code ndr_push_full_ptr(struct ndr_push *ndr, const void *p);
|
||||
enum ndr_err_code ndr_push_ref_ptr(struct ndr_push *ndr);
|
||||
void ndr_print_struct(struct ndr_print *ndr, const char *name, const char *type);
|
||||
void ndr_print_enum(struct ndr_print *ndr, const char *name, const char *type, const char *val, uint32_t value);
|
||||
void ndr_print_bitmap_flag(struct ndr_print *ndr, size_t size, const char *flag_name, uint32_t flag, uint32_t value);
|
||||
void ndr_print_bitmap_flag(struct ndr_print *ndr, size_t size, const char *flag_name, uint32_t flag, uint32_t value);
|
||||
void ndr_print_ptr(struct ndr_print *ndr, const char *name, const void *p);
|
||||
void ndr_print_union(struct ndr_print *ndr, const char *name, int level, const char *type);
|
||||
void ndr_print_bad_level(struct ndr_print *ndr, const char *name, uint16_t level);
|
||||
void ndr_print_array_uint8(struct ndr_print *ndr, const char *name, const uint8_t *data, uint32_t count);
|
||||
uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags);
|
||||
|
||||
/* strings */
|
||||
uint32_t ndr_charset_length(const void *var, charset_t chset);
|
||||
size_t ndr_string_array_size(struct ndr_push *ndr, const char *s);
|
||||
uint32_t ndr_size_string(int ret, const char * const* string, int flags);
|
||||
enum ndr_err_code ndr_pull_string_array(struct ndr_pull *ndr, int ndr_flags, const char ***_a);
|
||||
enum ndr_err_code ndr_push_string_array(struct ndr_push *ndr, int ndr_flags, const char **a);
|
||||
void ndr_print_string_array(struct ndr_print *ndr, const char *name, const char **a);
|
||||
uint32_t ndr_string_length(const void *_var, uint32_t element_size);
|
||||
enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size);
|
||||
enum ndr_err_code ndr_pull_charset(struct ndr_pull *ndr, int ndr_flags, const char **var, uint32_t length, uint8_t byte_mul, charset_t chset);
|
||||
enum ndr_err_code ndr_push_charset(struct ndr_push *ndr, int ndr_flags, const char *var, uint32_t length, uint8_t byte_mul, charset_t chset);
|
||||
|
||||
/* GUIDs */
|
||||
bool GUID_equal(const struct GUID *u1, const struct GUID *u2);
|
||||
NTSTATUS GUID_from_string(const char *s, struct GUID *guid);
|
||||
NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid);
|
||||
struct GUID GUID_zero(void);
|
||||
bool GUID_all_zero(const struct GUID *u);
|
||||
int GUID_compare(const struct GUID *u1, const struct GUID *u2);
|
||||
char *GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid);
|
||||
char *GUID_string2(TALLOC_CTX *mem_ctx, const struct GUID *guid);
|
||||
char *NS_GUID_string(TALLOC_CTX *mem_ctx, const struct GUID *guid);
|
||||
struct GUID GUID_random(void);
|
||||
|
||||
#endif /* __LIBNDR_H__ */
|
||||
|
||||
@ -63,6 +63,7 @@ _PUBLIC_ struct ndr_pull *ndr_pull_init_blob(const DATA_BLOB *blob, TALLOC_CTX *
|
||||
|
||||
ndr->data = blob->data;
|
||||
ndr->data_size = blob->length;
|
||||
ndr->iconv_convenience = talloc_reference(ndr, iconv_convenience);
|
||||
|
||||
return ndr;
|
||||
}
|
||||
@ -95,21 +96,6 @@ static enum ndr_err_code ndr_pull_set_offset(struct ndr_pull *ndr, uint32_t ofs)
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
/* save the offset/size of the current ndr state */
|
||||
_PUBLIC_ void ndr_pull_save(struct ndr_pull *ndr, struct ndr_pull_save *save)
|
||||
{
|
||||
save->offset = ndr->offset;
|
||||
save->data_size = ndr->data_size;
|
||||
}
|
||||
|
||||
/* restore the size/offset of a ndr structure */
|
||||
_PUBLIC_ void ndr_pull_restore(struct ndr_pull *ndr, struct ndr_pull_save *save)
|
||||
{
|
||||
ndr->offset = save->offset;
|
||||
ndr->data_size = save->data_size;
|
||||
}
|
||||
|
||||
|
||||
/* create a ndr_push structure, ready for some marshalling */
|
||||
_PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience)
|
||||
{
|
||||
@ -126,6 +112,7 @@ _PUBLIC_ struct ndr_push *ndr_push_init_ctx(TALLOC_CTX *mem_ctx, struct smb_icon
|
||||
if (!ndr->data) {
|
||||
return NULL;
|
||||
}
|
||||
ndr->iconv_convenience = talloc_reference(ndr, iconv_convenience);
|
||||
|
||||
return ndr;
|
||||
}
|
||||
@ -194,7 +181,7 @@ _PUBLIC_ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format,
|
||||
free(s);
|
||||
}
|
||||
|
||||
_PUBLIC_ void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3)
|
||||
_PUBLIC_ void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
int i;
|
||||
@ -417,6 +404,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
{
|
||||
struct ndr_pull *subndr;
|
||||
uint32_t r_content_size;
|
||||
bool force_le = false;
|
||||
bool force_be = false;
|
||||
|
||||
switch (header_size) {
|
||||
case 0: {
|
||||
@ -449,6 +438,74 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
r_content_size = content_size;
|
||||
break;
|
||||
}
|
||||
case 0xFFFFFC01: {
|
||||
/*
|
||||
* Common Type Header for the Serialization Stream
|
||||
* See [MS-RPCE] 2.2.6 Type Serialization Version 1
|
||||
*/
|
||||
uint8_t version;
|
||||
uint8_t drep;
|
||||
uint16_t hdrlen;
|
||||
uint32_t filler;
|
||||
uint32_t content_size;
|
||||
uint32_t reserved;
|
||||
|
||||
/* version */
|
||||
NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &version));
|
||||
|
||||
if (version != 1) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
|
||||
"Bad subcontext (PULL) Common Type Header version %d != 1",
|
||||
(int)version);
|
||||
}
|
||||
|
||||
/*
|
||||
* 0x10 little endian
|
||||
* 0x00 big endian
|
||||
*/
|
||||
NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &drep));
|
||||
if (drep == 0x10) {
|
||||
force_le = true;
|
||||
} else if (drep == 0x00) {
|
||||
force_be = true;
|
||||
} else {
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
|
||||
"Bad subcontext (PULL) Common Type Header invalid drep 0x%02X",
|
||||
(unsigned int)drep);
|
||||
}
|
||||
|
||||
/* length of the "Private Header for Constructed Type" */
|
||||
NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &hdrlen));
|
||||
if (hdrlen != 8) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
|
||||
"Bad subcontext (PULL) Common Type Header length %d != 8",
|
||||
(int)hdrlen);
|
||||
}
|
||||
|
||||
/* filler should be ignored */
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &filler));
|
||||
|
||||
/*
|
||||
* Private Header for Constructed Type
|
||||
*/
|
||||
/* length - will be updated latter */
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &content_size));
|
||||
if (size_is >= 0 && size_is != content_size) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) size_is(%d) mismatch content_size %d",
|
||||
(int)size_is, (int)content_size);
|
||||
}
|
||||
/* the content size must be a multiple of 8 */
|
||||
if ((content_size % 8) != 0) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT,
|
||||
"Bad subcontext (PULL) size_is(%d) not padded to 8 content_size %d",
|
||||
(int)size_is, (int)content_size);
|
||||
}
|
||||
r_content_size = content_size;
|
||||
|
||||
/* reserved */
|
||||
NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &reserved));
|
||||
break;
|
||||
}
|
||||
default:
|
||||
return ndr_pull_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext (PULL) header_size %d",
|
||||
(int)header_size);
|
||||
@ -464,6 +521,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_subcontext_start(struct ndr_pull *ndr,
|
||||
subndr->data = ndr->data + ndr->offset;
|
||||
subndr->offset = 0;
|
||||
subndr->data_size = r_content_size;
|
||||
subndr->iconv_convenience = talloc_reference(subndr, ndr->iconv_convenience);
|
||||
|
||||
if (force_le) {
|
||||
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_LITTLE_ENDIAN);
|
||||
} else if (force_be) {
|
||||
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_BIGENDIAN);
|
||||
}
|
||||
|
||||
*_subndr = subndr;
|
||||
return NDR_ERR_SUCCESS;
|
||||
@ -493,7 +557,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_start(struct ndr_push *ndr,
|
||||
{
|
||||
struct ndr_push *subndr;
|
||||
|
||||
subndr = ndr_push_init_ctx(ndr, NULL);
|
||||
subndr = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
|
||||
NDR_ERR_HAVE_NO_MEMORY(subndr);
|
||||
subndr->flags = ndr->flags;
|
||||
|
||||
@ -509,8 +573,10 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
size_t header_size,
|
||||
ssize_t size_is)
|
||||
{
|
||||
ssize_t padding_len;
|
||||
|
||||
if (size_is >= 0) {
|
||||
ssize_t padding_len = size_is - subndr->offset;
|
||||
padding_len = size_is - subndr->offset;
|
||||
if (padding_len > 0) {
|
||||
NDR_CHECK(ndr_push_zero(subndr, padding_len));
|
||||
} else if (padding_len < 0) {
|
||||
@ -531,6 +597,41 @@ _PUBLIC_ enum ndr_err_code ndr_push_subcontext_end(struct ndr_push *ndr,
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, subndr->offset));
|
||||
break;
|
||||
|
||||
case 0xFFFFFC01:
|
||||
/*
|
||||
* Common Type Header for the Serialization Stream
|
||||
* See [MS-RPCE] 2.2.6 Type Serialization Version 1
|
||||
*/
|
||||
padding_len = NDR_ROUND(subndr->offset, 8) - subndr->offset;
|
||||
if (padding_len > 0) {
|
||||
NDR_CHECK(ndr_push_zero(subndr, padding_len));
|
||||
}
|
||||
|
||||
/* version */
|
||||
NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, 1));
|
||||
|
||||
/*
|
||||
* 0x10 little endian
|
||||
* 0x00 big endian
|
||||
*/
|
||||
NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, NDR_BE(ndr)?0x00:0x10));
|
||||
|
||||
/* length of the "Private Header for Constructed Type" */
|
||||
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 8));
|
||||
|
||||
/* filler */
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0xCCCCCCCC));
|
||||
|
||||
/*
|
||||
* Private Header for Constructed Type
|
||||
*/
|
||||
/* length - will be updated latter */
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, subndr->offset));
|
||||
|
||||
/* reserved */
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
|
||||
break;
|
||||
|
||||
default:
|
||||
return ndr_push_error(ndr, NDR_ERR_SUBCONTEXT, "Bad subcontext header size %d",
|
||||
(int)header_size);
|
||||
@ -712,11 +813,8 @@ _PUBLIC_ uint32_t ndr_print_get_switch_value(struct ndr_print *ndr, const void *
|
||||
/*
|
||||
pull a struct from a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
void *p,
|
||||
ndr_pull_flags_fn_t fn)
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p,
|
||||
ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx, iconv_convenience);
|
||||
@ -728,7 +826,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_struct_blob(const DATA_BLOB *blob,
|
||||
/*
|
||||
pull a struct from a blob using NDR - failing if all bytes are not consumed
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
void *p, ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
@ -747,11 +845,12 @@ _PUBLIC_ enum ndr_err_code ndr_pull_struct_blob_all(const DATA_BLOB *blob, TALLO
|
||||
/*
|
||||
pull a union from a blob using NDR, given the union discriminator
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx, NULL);
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx, iconv_convenience);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
@ -762,11 +861,12 @@ _PUBLIC_ enum ndr_err_code ndr_pull_union_blob(const DATA_BLOB *blob, TALLOC_CTX
|
||||
pull a union from a blob using NDR, given the union discriminator,
|
||||
failing if all bytes are not consumed
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience, void *p,
|
||||
uint32_t level, ndr_pull_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_pull *ndr;
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx, NULL);
|
||||
ndr = ndr_pull_init_blob(blob, mem_ctx, iconv_convenience);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
NDR_CHECK(ndr_pull_set_switch_value(ndr, p, level));
|
||||
NDR_CHECK(fn(ndr, NDR_SCALARS|NDR_BUFFERS, p));
|
||||
@ -781,11 +881,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_union_blob_all(const DATA_BLOB *blob, TALLOC
|
||||
/*
|
||||
push a struct to a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob,
|
||||
TALLOC_CTX *mem_ctx,
|
||||
struct smb_iconv_convenience *iconv_convenience,
|
||||
const void *p,
|
||||
ndr_push_flags_fn_t fn)
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, const void *p, ndr_push_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
ndr = ndr_push_init_ctx(mem_ctx, iconv_convenience);
|
||||
@ -803,11 +899,11 @@ _PUBLIC_ enum ndr_err_code ndr_push_struct_blob(DATA_BLOB *blob,
|
||||
/*
|
||||
push a union to a blob using NDR
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_union_blob(DATA_BLOB *blob, TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience, void *p,
|
||||
uint32_t level, ndr_push_flags_fn_t fn)
|
||||
{
|
||||
struct ndr_push *ndr;
|
||||
ndr = ndr_push_init_ctx(mem_ctx, NULL);
|
||||
ndr = ndr_push_init_ctx(mem_ctx, iconv_convenience);
|
||||
NDR_ERR_HAVE_NO_MEMORY(ndr);
|
||||
|
||||
NDR_CHECK(ndr_push_set_switch_value(ndr, p, level));
|
||||
@ -932,12 +1028,12 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr1(struct ndr_push *ndr, const vo
|
||||
*/
|
||||
_PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
|
||||
{
|
||||
struct ndr_push_save save;
|
||||
uint32_t save_offset;
|
||||
uint32_t ptr_offset = 0xFFFFFFFF;
|
||||
if (p == NULL) {
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
ndr_push_save(ndr, &save);
|
||||
save_offset = ndr->offset;
|
||||
NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ptr_offset));
|
||||
if (ptr_offset > ndr->offset) {
|
||||
return ndr_push_error(ndr, NDR_ERR_BUFSIZE,
|
||||
@ -945,13 +1041,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2(struct ndr_push *ndr, const vo
|
||||
ptr_offset, ndr->offset);
|
||||
}
|
||||
ndr->offset = ptr_offset;
|
||||
if (save.offset < ndr->relative_base_offset) {
|
||||
if (save_offset < ndr->relative_base_offset) {
|
||||
return ndr_push_error(ndr, NDR_ERR_BUFSIZE,
|
||||
"ndr_push_relative_ptr2 save.offset(%u) < ndr->relative_base_offset(%u)",
|
||||
save.offset, ndr->relative_base_offset);
|
||||
"ndr_push_relative_ptr2 save_offset(%u) < ndr->relative_base_offset(%u)",
|
||||
save_offset, ndr->relative_base_offset);
|
||||
}
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset - ndr->relative_base_offset));
|
||||
ndr_push_restore(ndr, &save);
|
||||
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save_offset - ndr->relative_base_offset));
|
||||
ndr->offset = save_offset;
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
@ -446,22 +446,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_array_uint8(struct ndr_push *ndr, int ndr_fl
|
||||
return ndr_push_bytes(ndr, data, n);
|
||||
}
|
||||
|
||||
/*
|
||||
save the current position
|
||||
*/
|
||||
_PUBLIC_ void ndr_push_save(struct ndr_push *ndr, struct ndr_push_save *save)
|
||||
{
|
||||
save->offset = ndr->offset;
|
||||
}
|
||||
|
||||
/*
|
||||
restore the position
|
||||
*/
|
||||
_PUBLIC_ void ndr_push_restore(struct ndr_push *ndr, struct ndr_push_save *save)
|
||||
{
|
||||
ndr->offset = save->offset;
|
||||
}
|
||||
|
||||
/*
|
||||
push a unique non-zero value if a pointer is non-NULL, otherwise 0
|
||||
*/
|
||||
@ -846,4 +830,3 @@ _PUBLIC_ uint32_t ndr_size_DATA_BLOB(int ret, const DATA_BLOB *data, int flags)
|
||||
if (!data) return ret;
|
||||
return ret + data->length;
|
||||
}
|
||||
|
||||
|
||||
@ -1,27 +1,26 @@
|
||||
/*
|
||||
/*
|
||||
Unix SMB/CIFS implementation.
|
||||
|
||||
routines for marshalling/unmarshalling spoolss subcontext buffer structures
|
||||
|
||||
Copyright (C) Stefan Metzmacher 2005
|
||||
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#include "includes.h"
|
||||
|
||||
#include "librpc/gen_ndr/ndr_krb5pac.h"
|
||||
|
||||
static size_t _ndr_size_PAC_INFO(const union PAC_INFO *r, uint32_t level, int flags)
|
||||
|
||||
@ -23,8 +23,19 @@
|
||||
*/
|
||||
|
||||
#include "includes.h"
|
||||
#include "system/network.h"
|
||||
#include "librpc/ndr/libndr.h"
|
||||
|
||||
void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid)
|
||||
_PUBLIC_ void ndr_print_in_addr(struct ndr_print *ndr, const char *name, const struct in_addr *_ip)
|
||||
{
|
||||
struct in_addr ip;
|
||||
|
||||
ip.s_addr = htonl(_ip->s_addr);
|
||||
|
||||
ndr->print(ndr, "%-25s: %s", name, inet_ntoa(ip));
|
||||
}
|
||||
|
||||
_PUBLIC_ void ndr_print_GUID(struct ndr_print *ndr, const char *name, const struct GUID *guid)
|
||||
{
|
||||
ndr->print(ndr, "%-25s: %s", name, GUID_string(ndr, guid));
|
||||
}
|
||||
|
||||
@ -258,22 +258,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_string(struct ndr_pull *ndr, int ndr_flags,
|
||||
*s = as;
|
||||
break;
|
||||
|
||||
case LIBNDR_FLAG_STR_FIXLEN15:
|
||||
case LIBNDR_FLAG_STR_FIXLEN32:
|
||||
len1 = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
|
||||
NDR_PULL_NEED_BYTES(ndr, len1*byte_mul);
|
||||
if (!convert_string_talloc(ndr->current_mem_ctx, chset, CH_UNIX,
|
||||
ndr->data+ndr->offset, len1*byte_mul,
|
||||
(void **)(void *)&as,
|
||||
&converted_size, false))
|
||||
{
|
||||
return ndr_pull_error(ndr, NDR_ERR_CHARCNV,
|
||||
"Bad char conversion");
|
||||
}
|
||||
NDR_CHECK(ndr_pull_advance(ndr, len1*byte_mul));
|
||||
*s = as;
|
||||
break;
|
||||
|
||||
case LIBNDR_FLAG_STR_NOTERM:
|
||||
if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) {
|
||||
return ndr_pull_error(ndr, NDR_ERR_STRING, "Bad string flags 0x%x (missing NDR_REMAINING)\n",
|
||||
@ -346,10 +330,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags,
|
||||
|
||||
flags &= ~LIBNDR_FLAG_STR_CONFORMANT;
|
||||
|
||||
if (!(flags &
|
||||
(LIBNDR_FLAG_STR_NOTERM |
|
||||
LIBNDR_FLAG_STR_FIXLEN15 |
|
||||
LIBNDR_FLAG_STR_FIXLEN32))) {
|
||||
if (!(flags & LIBNDR_FLAG_STR_NOTERM)) {
|
||||
s_len++;
|
||||
}
|
||||
if (!convert_string_talloc(ndr, CH_UNIX, chset, s, s_len,
|
||||
@ -397,21 +378,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, int ndr_flags,
|
||||
NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
|
||||
break;
|
||||
|
||||
case LIBNDR_FLAG_STR_FIXLEN15:
|
||||
case LIBNDR_FLAG_STR_FIXLEN32: {
|
||||
ssize_t fix_len = (flags & LIBNDR_FLAG_STR_FIXLEN32)?32:15;
|
||||
uint32_t pad_len = fix_len - d_len;
|
||||
if (d_len > fix_len) {
|
||||
return ndr_push_error(ndr, NDR_ERR_CHARCNV,
|
||||
"Bad char conversion");
|
||||
}
|
||||
NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
|
||||
if (pad_len != 0) {
|
||||
NDR_CHECK(ndr_push_zero(ndr, pad_len));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
default:
|
||||
if (ndr->flags & LIBNDR_FLAG_REMAINING) {
|
||||
NDR_CHECK(ndr_push_bytes(ndr, dest, d_len));
|
||||
@ -437,13 +403,6 @@ _PUBLIC_ size_t ndr_string_array_size(struct ndr_push *ndr, const char *s)
|
||||
unsigned byte_mul = 2;
|
||||
unsigned c_len_term = 1;
|
||||
|
||||
if (flags & LIBNDR_FLAG_STR_FIXLEN32) {
|
||||
return 32;
|
||||
}
|
||||
if (flags & LIBNDR_FLAG_STR_FIXLEN15) {
|
||||
return 15;
|
||||
}
|
||||
|
||||
c_len = s?strlen_m(s):0;
|
||||
|
||||
if (flags & (LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_UTF8)) {
|
||||
@ -653,21 +612,21 @@ _PUBLIC_ uint32_t ndr_string_length(const void *_var, uint32_t element_size)
|
||||
_PUBLIC_ enum ndr_err_code ndr_check_string_terminator(struct ndr_pull *ndr, uint32_t count, uint32_t element_size)
|
||||
{
|
||||
uint32_t i;
|
||||
struct ndr_pull_save save_offset;
|
||||
uint32_t save_offset;
|
||||
|
||||
ndr_pull_save(ndr, &save_offset);
|
||||
save_offset = ndr->offset;
|
||||
ndr_pull_advance(ndr, (count - 1) * element_size);
|
||||
NDR_PULL_NEED_BYTES(ndr, element_size);
|
||||
|
||||
for (i = 0; i < element_size; i++) {
|
||||
if (ndr->data[ndr->offset+i] != 0) {
|
||||
ndr_pull_restore(ndr, &save_offset);
|
||||
ndr->offset = save_offset;
|
||||
|
||||
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "String terminator not present or outside string boundaries");
|
||||
}
|
||||
}
|
||||
|
||||
ndr_pull_restore(ndr, &save_offset);
|
||||
ndr->offset = save_offset;
|
||||
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
|
||||
@ -110,7 +110,7 @@ _PUBLIC_ NTSTATUS NS_GUID_from_string(const char *s, struct GUID *guid)
|
||||
/**
|
||||
* generate a random GUID
|
||||
*/
|
||||
struct GUID GUID_random(void)
|
||||
_PUBLIC_ struct GUID GUID_random(void)
|
||||
{
|
||||
struct GUID guid;
|
||||
|
||||
|
||||
@ -249,7 +249,7 @@ bool receive_getdc_response(TALLOC_CTX *mem_ctx,
|
||||
blob.data += 4;
|
||||
blob.length -= 4;
|
||||
|
||||
ndr_err = ndr_pull_union_blob_all(&blob, mem_ctx, &p, DGRAM_SMB,
|
||||
ndr_err = ndr_pull_union_blob_all(&blob, mem_ctx, NULL, &p, DGRAM_SMB,
|
||||
(ndr_pull_flags_fn_t)ndr_pull_dgram_smb_packet);
|
||||
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
|
||||
DEBUG(0,("failed to parse packet\n"));
|
||||
|
||||
Loading…
Reference in New Issue
Block a user