summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2009-11-03 23:46:26 +0100
committerGünther Deschner <gd@samba.org>2009-11-03 23:47:57 +0100
commit8be9ec604e3208c339263ba1cb59c725255ace9b (patch)
tree0292f4316f8de6b121616e24696388b873af3d24
parent97496bb3cafd8914a3a7c7b7d3a668ba3e533769 (diff)
downloadsamba-8be9ec604e3208c339263ba1cb59c725255ace9b.tar.gz
samba-8be9ec604e3208c339263ba1cb59c725255ace9b.tar.bz2
samba-8be9ec604e3208c339263ba1cb59c725255ace9b.zip
security: re-run make samba3-idl after IDL change.
Guenther
-rw-r--r--librpc/gen_ndr/ndr_security.c24
-rw-r--r--librpc/gen_ndr/security.h1
2 files changed, 0 insertions, 25 deletions
diff --git a/librpc/gen_ndr/ndr_security.c b/librpc/gen_ndr/ndr_security.c
index 5453d0c12b..e20776bb14 100644
--- a/librpc/gen_ndr/ndr_security.c
+++ b/librpc/gen_ndr/ndr_security.c
@@ -865,7 +865,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_token(struct ndr_push *ndr, int ndr
NDR_CHECK(ndr_push_unique_ptr(ndr, r->sids[cntr_sids_0]));
}
NDR_CHECK(ndr_push_udlong(ndr, NDR_SCALARS, r->privilege_mask));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->default_dacl));
NDR_CHECK(ndr_push_trailer_align(ndr, 5));
}
if (ndr_flags & NDR_BUFFERS) {
@@ -880,9 +879,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_security_token(struct ndr_push *ndr, int ndr
NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->sids[cntr_sids_0]));
}
}
- if (r->default_dacl) {
- NDR_CHECK(ndr_push_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->default_dacl));
- }
}
return NDR_ERR_SUCCESS;
}
@@ -897,8 +893,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
uint32_t cntr_sids_0;
TALLOC_CTX *_mem_save_sids_0;
TALLOC_CTX *_mem_save_sids_1;
- uint32_t _ptr_default_dacl;
- TALLOC_CTX *_mem_save_default_dacl_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 5));
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_user_sid));
@@ -928,12 +922,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
}
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sids_0, 0);
NDR_CHECK(ndr_pull_udlong(ndr, NDR_SCALARS, &r->privilege_mask));
- NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_dacl));
- if (_ptr_default_dacl) {
- NDR_PULL_ALLOC(ndr, r->default_dacl);
- } else {
- r->default_dacl = NULL;
- }
if (r->sids) {
NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->sids, r->num_sids));
}
@@ -963,12 +951,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_security_token(struct ndr_pull *ndr, int ndr
}
}
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_sids_0, 0);
- if (r->default_dacl) {
- _mem_save_default_dacl_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->default_dacl, 0);
- NDR_CHECK(ndr_pull_security_acl(ndr, NDR_SCALARS|NDR_BUFFERS, r->default_dacl));
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_default_dacl_0, 0);
- }
}
return NDR_ERR_SUCCESS;
}
@@ -1007,12 +989,6 @@ _PUBLIC_ void ndr_print_security_token(struct ndr_print *ndr, const char *name,
}
ndr->depth--;
ndr_print_udlong(ndr, "privilege_mask", r->privilege_mask);
- ndr_print_ptr(ndr, "default_dacl", r->default_dacl);
- ndr->depth++;
- if (r->default_dacl) {
- ndr_print_security_acl(ndr, "default_dacl", r->default_dacl);
- }
- ndr->depth--;
ndr->depth--;
}
diff --git a/librpc/gen_ndr/security.h b/librpc/gen_ndr/security.h
index 297ba18d7f..c42b6ed258 100644
--- a/librpc/gen_ndr/security.h
+++ b/librpc/gen_ndr/security.h
@@ -350,7 +350,6 @@ struct security_token {
uint32_t num_sids;
struct dom_sid **sids;/* [unique,size_is(num_sids)] */
uint64_t privilege_mask;
- struct security_acl *default_dacl;/* [unique] */
}/* [public] */;
/* bitmap security_secinfo */