From b8834cad073e6b8ffb8eb8b7d731c40048d847ec Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Mon, 14 Sep 2009 06:47:37 +0200 Subject: schannel: remove unused schannel structs. Guenther --- librpc/gen_ndr/ndr_schannel.c | 272 ------------------------------------------ librpc/gen_ndr/ndr_schannel.h | 9 -- librpc/gen_ndr/schannel.h | 29 ----- librpc/idl/schannel.idl | 34 ------ 4 files changed, 344 deletions(-) (limited to 'librpc') diff --git a/librpc/gen_ndr/ndr_schannel.c b/librpc/gen_ndr/ndr_schannel.c index 4bbb56a8b0..e9adcf619b 100644 --- a/librpc/gen_ndr/ndr_schannel.c +++ b/librpc/gen_ndr/ndr_schannel.c @@ -5,278 +5,6 @@ #include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_nbt.h" -static enum ndr_err_code ndr_push_schannel_bind_3(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind_3 *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_align(ndr, 4)); - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain)); - ndr->flags = _flags_save_string; - } - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->workstation)); - ndr->flags = _flags_save_string; - } - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_schannel_bind_3(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind_3 *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain)); - ndr->flags = _flags_save_string; - } - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->workstation)); - ndr->flags = _flags_save_string; - } - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_schannel_bind_3(struct ndr_print *ndr, const char *name, const struct schannel_bind_3 *r) -{ - ndr_print_struct(ndr, name, "schannel_bind_3"); - ndr->depth++; - ndr_print_string(ndr, "domain", r->domain); - ndr_print_string(ndr, "workstation", r->workstation); - ndr->depth--; -} - -static enum ndr_err_code ndr_push_schannel_bind_23(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind_23 *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_align(ndr, 4)); - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain)); - ndr->flags = _flags_save_string; - } - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->workstation)); - ndr->flags = _flags_save_string; - } - NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->dnsdomain)); - NDR_CHECK(ndr_push_nbt_string(ndr, NDR_SCALARS, r->dnsworkstation)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_schannel_bind_23(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind_23 *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain)); - ndr->flags = _flags_save_string; - } - { - uint32_t _flags_save_string = ndr->flags; - ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM); - NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->workstation)); - ndr->flags = _flags_save_string; - } - NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->dnsdomain)); - NDR_CHECK(ndr_pull_nbt_string(ndr, NDR_SCALARS, &r->dnsworkstation)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_schannel_bind_23(struct ndr_print *ndr, const char *name, const struct schannel_bind_23 *r) -{ - ndr_print_struct(ndr, name, "schannel_bind_23"); - ndr->depth++; - ndr_print_string(ndr, "domain", r->domain); - ndr_print_string(ndr, "workstation", r->workstation); - ndr_print_nbt_string(ndr, "dnsdomain", r->dnsdomain); - ndr_print_nbt_string(ndr, "dnsworkstation", r->dnsworkstation); - ndr->depth--; -} - -static enum ndr_err_code ndr_push_schannel_bind_info(struct ndr_push *ndr, int ndr_flags, const union schannel_bind_info *r) -{ - if (ndr_flags & NDR_SCALARS) { - int level = ndr_push_get_switch_value(ndr, r); - switch (level) { - case 3: { - NDR_CHECK(ndr_push_schannel_bind_3(ndr, NDR_SCALARS, &r->info3)); - break; } - - case 23: { - NDR_CHECK(ndr_push_schannel_bind_23(ndr, NDR_SCALARS, &r->info23)); - break; } - - default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); - } - } - if (ndr_flags & NDR_BUFFERS) { - int level = ndr_push_get_switch_value(ndr, r); - switch (level) { - case 3: - break; - - case 23: - break; - - default: - return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); - } - } - return NDR_ERR_SUCCESS; -} - -static enum ndr_err_code ndr_pull_schannel_bind_info(struct ndr_pull *ndr, int ndr_flags, union schannel_bind_info *r) -{ - int level; - level = ndr_pull_get_switch_value(ndr, r); - if (ndr_flags & NDR_SCALARS) { - switch (level) { - case 3: { - NDR_CHECK(ndr_pull_schannel_bind_3(ndr, NDR_SCALARS, &r->info3)); - break; } - - case 23: { - NDR_CHECK(ndr_pull_schannel_bind_23(ndr, NDR_SCALARS, &r->info23)); - break; } - - default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); - } - } - if (ndr_flags & NDR_BUFFERS) { - switch (level) { - case 3: - break; - - case 23: - break; - - default: - return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u at %s", level, __location__); - } - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_schannel_bind_info(struct ndr_print *ndr, const char *name, const union schannel_bind_info *r) -{ - int level; - level = ndr_print_get_switch_value(ndr, r); - ndr_print_union(ndr, name, level, "schannel_bind_info"); - switch (level) { - case 3: - ndr_print_schannel_bind_3(ndr, "info3", &r->info3); - break; - - case 23: - ndr_print_schannel_bind_23(ndr, "info23", &r->info23); - break; - - default: - ndr_print_bad_level(ndr, name, level); - } -} - -_PUBLIC_ enum ndr_err_code ndr_push_schannel_bind(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_align(ndr, 4)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->bind_type)); - NDR_CHECK(ndr_push_set_switch_value(ndr, &r->u, r->bind_type)); - NDR_CHECK(ndr_push_schannel_bind_info(ndr, NDR_SCALARS, &r->u)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ enum ndr_err_code ndr_pull_schannel_bind(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->bind_type)); - NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->u, r->bind_type)); - NDR_CHECK(ndr_pull_schannel_bind_info(ndr, NDR_SCALARS, &r->u)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_schannel_bind(struct ndr_print *ndr, const char *name, const struct schannel_bind *r) -{ - ndr_print_struct(ndr, name, "schannel_bind"); - ndr->depth++; - ndr_print_uint32(ndr, "unknown1", r->unknown1); - ndr_print_uint32(ndr, "bind_type", r->bind_type); - ndr_print_set_switch_value(ndr, &r->u, r->bind_type); - ndr_print_schannel_bind_info(ndr, "u", &r->u); - ndr->depth--; -} - -_PUBLIC_ enum ndr_err_code ndr_push_schannel_bind_ack(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind_ack *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_push_align(ndr, 4)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown2)); - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown3)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ enum ndr_err_code ndr_pull_schannel_bind_ack(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind_ack *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - 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->unknown3)); - } - if (ndr_flags & NDR_BUFFERS) { - } - return NDR_ERR_SUCCESS; -} - -_PUBLIC_ void ndr_print_schannel_bind_ack(struct ndr_print *ndr, const char *name, const struct schannel_bind_ack *r) -{ - ndr_print_struct(ndr, name, "schannel_bind_ack"); - ndr->depth++; - ndr_print_uint32(ndr, "unknown1", r->unknown1); - ndr_print_uint32(ndr, "unknown2", r->unknown2); - ndr_print_uint32(ndr, "unknown3", r->unknown3); - ndr->depth--; -} - _PUBLIC_ enum ndr_err_code ndr_push_netlogon_creds_CredentialState(struct ndr_push *ndr, int ndr_flags, const struct netlogon_creds_CredentialState *r) { { diff --git a/librpc/gen_ndr/ndr_schannel.h b/librpc/gen_ndr/ndr_schannel.h index ed4093366a..63ee1e4cc9 100644 --- a/librpc/gen_ndr/ndr_schannel.h +++ b/librpc/gen_ndr/ndr_schannel.h @@ -8,15 +8,6 @@ #include "../librpc/ndr/ndr_schannel.h" #define NDR_SCHANNEL_CALL_COUNT (0) -void ndr_print_schannel_bind_3(struct ndr_print *ndr, const char *name, const struct schannel_bind_3 *r); -void ndr_print_schannel_bind_23(struct ndr_print *ndr, const char *name, const struct schannel_bind_23 *r); -void ndr_print_schannel_bind_info(struct ndr_print *ndr, const char *name, const union schannel_bind_info *r); -enum ndr_err_code ndr_push_schannel_bind(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind *r); -enum ndr_err_code ndr_pull_schannel_bind(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind *r); -void ndr_print_schannel_bind(struct ndr_print *ndr, const char *name, const struct schannel_bind *r); -enum ndr_err_code ndr_push_schannel_bind_ack(struct ndr_push *ndr, int ndr_flags, const struct schannel_bind_ack *r); -enum ndr_err_code ndr_pull_schannel_bind_ack(struct ndr_pull *ndr, int ndr_flags, struct schannel_bind_ack *r); -void ndr_print_schannel_bind_ack(struct ndr_print *ndr, const char *name, const struct schannel_bind_ack *r); enum ndr_err_code ndr_push_netlogon_creds_CredentialState(struct ndr_push *ndr, int ndr_flags, const struct netlogon_creds_CredentialState *r); enum ndr_err_code ndr_pull_netlogon_creds_CredentialState(struct ndr_pull *ndr, int ndr_flags, struct netlogon_creds_CredentialState *r); void ndr_print_netlogon_creds_CredentialState(struct ndr_print *ndr, const char *name, const struct netlogon_creds_CredentialState *r); diff --git a/librpc/gen_ndr/schannel.h b/librpc/gen_ndr/schannel.h index 6a85af2f46..c07212fea6 100644 --- a/librpc/gen_ndr/schannel.h +++ b/librpc/gen_ndr/schannel.h @@ -9,35 +9,6 @@ #ifndef _HEADER_schannel #define _HEADER_schannel -struct schannel_bind_3 { - const char * domain;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ - const char * workstation;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ -}; - -struct schannel_bind_23 { - const char * domain;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ - const char * workstation;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ - const char * dnsdomain; - const char * dnsworkstation; -}; - -union schannel_bind_info { - struct schannel_bind_3 info3;/* [case(3)] */ - struct schannel_bind_23 info23;/* [case(23)] */ -}/* [nodiscriminant] */; - -struct schannel_bind { - uint32_t unknown1; - uint32_t bind_type; - union schannel_bind_info u;/* [switch_is(bind_type)] */ -}/* [public] */; - -struct schannel_bind_ack { - uint32_t unknown1; - uint32_t unknown2; - uint32_t unknown3; -}/* [public] */; - struct netlogon_creds_CredentialState { uint32_t negotiate_flags; uint8_t session_key[16]; diff --git a/librpc/idl/schannel.idl b/librpc/idl/schannel.idl index d9b230d70b..a30e2928e0 100644 --- a/librpc/idl/schannel.idl +++ b/librpc/idl/schannel.idl @@ -12,40 +12,6 @@ import "netlogon.idl", "nbt.idl"; ] interface schannel { - /* - a schannel bind blob - used in dcerpc auth_info - on a schannel - */ - typedef struct { - astring domain; - astring workstation; - } schannel_bind_3; - - typedef struct { - astring domain; - astring workstation; - nbt_string dnsdomain; - nbt_string dnsworkstation; - } schannel_bind_23; - - typedef [nodiscriminant] union { - [case (3)] schannel_bind_3 info3; - [case (23)] schannel_bind_23 info23; - } schannel_bind_info; - - typedef [public] struct { - uint32 unknown1; /* seems to need to be 0 */ - uint32 bind_type; - [switch_is(bind_type)] schannel_bind_info u; - } schannel_bind; - - /* a bind_ack blob */ - typedef [public] struct { - uint32 unknown1; /* 1 */ - uint32 unknown2; /* 0 */ - uint32 unknown3; /* 0x006c0000 */ - } schannel_bind_ack; - /* this structure is used internally in the NETLOGON server */ typedef [public,flag(NDR_PAHEX)] struct { -- cgit