diff options
| author | Günther Deschner <gd@samba.org> | 2008-11-14 16:12:34 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-11-18 10:06:55 +0100 |
| commit | c621c164d169cc93f0f965cc751e0d3b35cb5033 (patch) | |
| tree | ea0127fee811431c0125e9538aa458562625697b /source/librpc | |
| parent | 66b3769dcc1175b8aab184a5250f6396315be64e (diff) | |
| download | samba-c621c164d169cc93f0f965cc751e0d3b35cb5033.tar.gz samba-c621c164d169cc93f0f965cc751e0d3b35cb5033.tar.xz samba-c621c164d169cc93f0f965cc751e0d3b35cb5033.zip | |
re-run make idl.
Guenther
(cherry picked from commit 19568f4e4e94266a7792e6dce8eaa5086f435fc3)
Diffstat (limited to 'source/librpc')
| -rw-r--r-- | source/librpc/gen_ndr/ndr_security.c | 19 | ||||
| -rw-r--r-- | source/librpc/gen_ndr/security.h | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/source/librpc/gen_ndr/ndr_security.c b/source/librpc/gen_ndr/ndr_security.c index d54fdb2395e..23c8645a2fc 100644 --- a/source/librpc/gen_ndr/ndr_security.c +++ b/source/librpc/gen_ndr/ndr_security.c @@ -431,25 +431,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_ace(struct ndr_push *ndr, int ndr_f return NDR_ERR_SUCCESS; } -_PUBLIC_ enum ndr_err_code ndr_pull_security_ace(struct ndr_pull *ndr, int ndr_flags, struct security_ace *r) -{ - if (ndr_flags & NDR_SCALARS) { - NDR_CHECK(ndr_pull_align(ndr, 4)); - NDR_CHECK(ndr_pull_security_ace_type(ndr, NDR_SCALARS, &r->type)); - NDR_CHECK(ndr_pull_security_ace_flags(ndr, NDR_SCALARS, &r->flags)); - NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size)); - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->access_mask)); - NDR_CHECK(ndr_pull_set_switch_value(ndr, &r->object, r->type)); - NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_SCALARS, &r->object)); - NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->trustee)); - } - if (ndr_flags & NDR_BUFFERS) { - NDR_CHECK(ndr_pull_security_ace_object_ctr(ndr, NDR_BUFFERS, &r->object)); - NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_BUFFERS, &r->trustee)); - } - return NDR_ERR_SUCCESS; -} - _PUBLIC_ void ndr_print_security_ace(struct ndr_print *ndr, const char *name, const struct security_ace *r) { ndr_print_struct(ndr, name, "security_ace"); diff --git a/source/librpc/gen_ndr/security.h b/source/librpc/gen_ndr/security.h index 04655b178e2..e029aec4354 100644 --- a/source/librpc/gen_ndr/security.h +++ b/source/librpc/gen_ndr/security.h @@ -241,7 +241,7 @@ struct security_ace { uint32_t access_mask; union security_ace_object_ctr object;/* [switch_is(type)] */ struct dom_sid trustee; -}/* [gensize,public,nosize] */; +}/* [gensize,public,nopull,nosize] */; enum security_acl_revision #ifndef USE_UINT_ENUMS |