re-run make idl.
authorGünther Deschner <gd@samba.org>
Fri, 14 Nov 2008 15:12:34 +0000 (16:12 +0100)
committerGünther Deschner <gd@samba.org>
Fri, 14 Nov 2008 15:14:22 +0000 (16:14 +0100)
Guenther
(cherry picked from commit 19568f4e4e94266a7792e6dce8eaa5086f435fc3)

source/librpc/gen_ndr/ndr_security.c
source/librpc/gen_ndr/security.h

index d54fdb2395ebda7240fcb2c04021c7a1f958d61f..23c8645a2fc92fa5d1a42c81d4b80f77f6ac6c88 100644 (file)
@@ -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");
index 04655b178e2e6fc26787e98c50b0cce63d59a234..e029aec43544f5ff843bf71849129a0afbef4e07 100644 (file)
@@ -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