The branch, master has been updated
via 99cf696150a1b8e24a9d87981b710b703045a2a5 (commit)
via ccc18d4d5d3aa0c6a5767bdb8f0dbdd761b93897 (commit)
via 58feaa794791fd33fdb44686c6296e6bbfa8e7a1 (commit)
via ffd9d41be93984b6a139818184716e709fbfa1ef (commit)
from 23abcd2318c69753aa2a144e1dc0f9cf9efdb705 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 99cf696150a1b8e24a9d87981b710b703045a2a5
Author: Volker Lendecke <[email protected]>
Date: Fri Aug 28 14:25:11 2009 +0200
s3:winbind: Fix a bug found by RPC-SAMR
We need to enumerate passdb alias members
Thanks to gd for bugging me :-)
commit ccc18d4d5d3aa0c6a5767bdb8f0dbdd761b93897
Author: Volker Lendecke <[email protected]>
Date: Thu Aug 27 16:13:51 2009 +0200
s3:winbind: Fix a typo
commit 58feaa794791fd33fdb44686c6296e6bbfa8e7a1
Author: Volker Lendecke <[email protected]>
Date: Sun Aug 23 12:43:43 2009 +0200
s3:winbind: Rename wbint_GroupMembers to wbint_Principals
commit ffd9d41be93984b6a139818184716e709fbfa1ef
Author: Volker Lendecke <[email protected]>
Date: Sun Aug 23 12:38:35 2009 +0200
s3:winbind: Rename wbint_GroupMember to wbint_Principal
-----------------------------------------------------------------------
Summary of changes:
source3/librpc/gen_ndr/cli_wbint.c | 4 +-
source3/librpc/gen_ndr/cli_wbint.h | 4 +-
source3/librpc/gen_ndr/ndr_wbint.c | 88 ++++++++++++++++----------------
source3/librpc/gen_ndr/ndr_wbint.h | 12 ++--
source3/librpc/gen_ndr/srv_wbint.c | 4 +-
source3/librpc/gen_ndr/wbint.h | 12 ++--
source3/librpc/idl/wbint.idl | 12 ++--
source3/winbindd/wb_group_members.c | 41 +++++++--------
source3/winbindd/winbindd.h | 1 +
source3/winbindd/winbindd_ads.c | 4 +-
source3/winbindd/winbindd_cache.c | 7 ++-
source3/winbindd/winbindd_dual_srv.c | 14 +++---
source3/winbindd/winbindd_group.c | 15 +++--
source3/winbindd/winbindd_lookupsid.c | 2 +-
source3/winbindd/winbindd_passdb.c | 72 +++++++++++++--------------
source3/winbindd/winbindd_reconnect.c | 9 ++-
source3/winbindd/winbindd_rpc.c | 4 +-
17 files changed, 158 insertions(+), 147 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/librpc/gen_ndr/cli_wbint.c
b/source3/librpc/gen_ndr/cli_wbint.c
index ab9d984..06e0bf7 100644
--- a/source3/librpc/gen_ndr/cli_wbint.c
+++ b/source3/librpc/gen_ndr/cli_wbint.c
@@ -1816,7 +1816,7 @@ struct tevent_req
*rpccli_wbint_LookupGroupMembers_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client
*cli,
struct dom_sid *_sid /*
[in] [ref] */,
enum lsa_SidType _type
/* [in] */,
- struct
wbint_GroupMembers *_members /* [out] [ref] */)
+ struct wbint_Principals
*_members /* [out] [ref] */)
{
struct tevent_req *req;
struct rpccli_wbint_LookupGroupMembers_state *state;
@@ -1929,7 +1929,7 @@ NTSTATUS rpccli_wbint_LookupGroupMembers(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct dom_sid *sid /* [in] [ref] */,
enum lsa_SidType type /* [in] */,
- struct wbint_GroupMembers *members /*
[out] [ref] */)
+ struct wbint_Principals *members /*
[out] [ref] */)
{
struct wbint_LookupGroupMembers r;
NTSTATUS status;
diff --git a/source3/librpc/gen_ndr/cli_wbint.h
b/source3/librpc/gen_ndr/cli_wbint.h
index d5b333f..8e9c31e 100644
--- a/source3/librpc/gen_ndr/cli_wbint.h
+++ b/source3/librpc/gen_ndr/cli_wbint.h
@@ -153,7 +153,7 @@ struct tevent_req
*rpccli_wbint_LookupGroupMembers_send(TALLOC_CTX *mem_ctx,
struct rpc_pipe_client
*cli,
struct dom_sid *_sid /*
[in] [ref] */,
enum lsa_SidType _type
/* [in] */,
- struct
wbint_GroupMembers *_members /* [out] [ref] */);
+ struct wbint_Principals
*_members /* [out] [ref] */);
NTSTATUS rpccli_wbint_LookupGroupMembers_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
NTSTATUS *result);
@@ -161,5 +161,5 @@ NTSTATUS rpccli_wbint_LookupGroupMembers(struct
rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
struct dom_sid *sid /* [in] [ref] */,
enum lsa_SidType type /* [in] */,
- struct wbint_GroupMembers *members /*
[out] [ref] */);
+ struct wbint_Principals *members /*
[out] [ref] */);
#endif /* __CLI_WBINT__ */
diff --git a/source3/librpc/gen_ndr/ndr_wbint.c
b/source3/librpc/gen_ndr/ndr_wbint.c
index bb0d01b..996fbb5 100644
--- a/source3/librpc/gen_ndr/ndr_wbint.c
+++ b/source3/librpc/gen_ndr/ndr_wbint.c
@@ -290,13 +290,13 @@ _PUBLIC_ void ndr_print_wbint_RidArray(struct ndr_print
*ndr, const char *name,
ndr->depth--;
}
-_PUBLIC_ enum ndr_err_code ndr_push_wbint_GroupMember(struct ndr_push *ndr,
int ndr_flags, const struct wbint_GroupMember *r)
+_PUBLIC_ enum ndr_err_code ndr_push_wbint_Principal(struct ndr_push *ndr, int
ndr_flags, const struct wbint_Principal *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_push_align(ndr, 4));
NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, &r->sid));
- NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
NDR_CHECK(ndr_push_lsa_SidType(ndr, NDR_SCALARS, r->type));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->name));
}
if (ndr_flags & NDR_BUFFERS) {
if (r->name) {
@@ -309,20 +309,20 @@ _PUBLIC_ enum ndr_err_code
ndr_push_wbint_GroupMember(struct ndr_push *ndr, int
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_pull_wbint_GroupMember(struct ndr_pull *ndr,
int ndr_flags, struct wbint_GroupMember *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_wbint_Principal(struct ndr_pull *ndr, int
ndr_flags, struct wbint_Principal *r)
{
uint32_t _ptr_name;
TALLOC_CTX *_mem_save_name_0;
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, &r->sid));
+ NDR_CHECK(ndr_pull_lsa_SidType(ndr, NDR_SCALARS, &r->type));
NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name));
if (_ptr_name) {
NDR_PULL_ALLOC(ndr, r->name);
} else {
r->name = NULL;
}
- NDR_CHECK(ndr_pull_lsa_SidType(ndr, NDR_SCALARS, &r->type));
}
if (ndr_flags & NDR_BUFFERS) {
if (r->name) {
@@ -341,82 +341,82 @@ _PUBLIC_ enum ndr_err_code
ndr_pull_wbint_GroupMember(struct ndr_pull *ndr, int
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ void ndr_print_wbint_GroupMember(struct ndr_print *ndr, const char
*name, const struct wbint_GroupMember *r)
+_PUBLIC_ void ndr_print_wbint_Principal(struct ndr_print *ndr, const char
*name, const struct wbint_Principal *r)
{
- ndr_print_struct(ndr, name, "wbint_GroupMember");
+ ndr_print_struct(ndr, name, "wbint_Principal");
ndr->depth++;
ndr_print_dom_sid(ndr, "sid", &r->sid);
+ ndr_print_lsa_SidType(ndr, "type", r->type);
ndr_print_ptr(ndr, "name", r->name);
ndr->depth++;
if (r->name) {
ndr_print_string(ndr, "name", r->name);
}
ndr->depth--;
- ndr_print_lsa_SidType(ndr, "type", r->type);
ndr->depth--;
}
-_PUBLIC_ enum ndr_err_code ndr_push_wbint_GroupMembers(struct ndr_push *ndr,
int ndr_flags, const struct wbint_GroupMembers *r)
+_PUBLIC_ enum ndr_err_code ndr_push_wbint_Principals(struct ndr_push *ndr, int
ndr_flags, const struct wbint_Principals *r)
{
- uint32_t cntr_members_0;
+ uint32_t cntr_principals_0;
if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_members));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->num_principals));
NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->num_members));
- for (cntr_members_0 = 0; cntr_members_0 < r->num_members;
cntr_members_0++) {
- NDR_CHECK(ndr_push_wbint_GroupMember(ndr, NDR_SCALARS,
&r->members[cntr_members_0]));
+ NDR_CHECK(ndr_push_int32(ndr, NDR_SCALARS, r->num_principals));
+ for (cntr_principals_0 = 0; cntr_principals_0 <
r->num_principals; cntr_principals_0++) {
+ NDR_CHECK(ndr_push_wbint_Principal(ndr, NDR_SCALARS,
&r->principals[cntr_principals_0]));
}
}
if (ndr_flags & NDR_BUFFERS) {
- for (cntr_members_0 = 0; cntr_members_0 < r->num_members;
cntr_members_0++) {
- NDR_CHECK(ndr_push_wbint_GroupMember(ndr, NDR_BUFFERS,
&r->members[cntr_members_0]));
+ for (cntr_principals_0 = 0; cntr_principals_0 <
r->num_principals; cntr_principals_0++) {
+ NDR_CHECK(ndr_push_wbint_Principal(ndr, NDR_BUFFERS,
&r->principals[cntr_principals_0]));
}
}
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_pull_wbint_GroupMembers(struct ndr_pull *ndr,
int ndr_flags, struct wbint_GroupMembers *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_wbint_Principals(struct ndr_pull *ndr, int
ndr_flags, struct wbint_Principals *r)
{
- uint32_t cntr_members_0;
- TALLOC_CTX *_mem_save_members_0;
+ uint32_t cntr_principals_0;
+ TALLOC_CTX *_mem_save_principals_0;
if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_pull_array_size(ndr, &r->members));
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->principals));
NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->num_members));
- NDR_PULL_ALLOC_N(ndr, r->members, ndr_get_array_size(ndr,
&r->members));
- _mem_save_members_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->members, 0);
- for (cntr_members_0 = 0; cntr_members_0 < r->num_members;
cntr_members_0++) {
- NDR_CHECK(ndr_pull_wbint_GroupMember(ndr, NDR_SCALARS,
&r->members[cntr_members_0]));
+ NDR_CHECK(ndr_pull_int32(ndr, NDR_SCALARS, &r->num_principals));
+ NDR_PULL_ALLOC_N(ndr, r->principals, ndr_get_array_size(ndr,
&r->principals));
+ _mem_save_principals_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->principals, 0);
+ for (cntr_principals_0 = 0; cntr_principals_0 <
r->num_principals; cntr_principals_0++) {
+ NDR_CHECK(ndr_pull_wbint_Principal(ndr, NDR_SCALARS,
&r->principals[cntr_principals_0]));
}
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_members_0, 0);
- if (r->members) {
- NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->members,
r->num_members));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_principals_0, 0);
+ if (r->principals) {
+ NDR_CHECK(ndr_check_array_size(ndr,
(void*)&r->principals, r->num_principals));
}
}
if (ndr_flags & NDR_BUFFERS) {
- _mem_save_members_0 = NDR_PULL_GET_MEM_CTX(ndr);
- NDR_PULL_SET_MEM_CTX(ndr, r->members, 0);
- for (cntr_members_0 = 0; cntr_members_0 < r->num_members;
cntr_members_0++) {
- NDR_CHECK(ndr_pull_wbint_GroupMember(ndr, NDR_BUFFERS,
&r->members[cntr_members_0]));
+ _mem_save_principals_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->principals, 0);
+ for (cntr_principals_0 = 0; cntr_principals_0 <
r->num_principals; cntr_principals_0++) {
+ NDR_CHECK(ndr_pull_wbint_Principal(ndr, NDR_BUFFERS,
&r->principals[cntr_principals_0]));
}
- NDR_PULL_SET_MEM_CTX(ndr, _mem_save_members_0, 0);
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_principals_0, 0);
}
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ void ndr_print_wbint_GroupMembers(struct ndr_print *ndr, const char
*name, const struct wbint_GroupMembers *r)
+_PUBLIC_ void ndr_print_wbint_Principals(struct ndr_print *ndr, const char
*name, const struct wbint_Principals *r)
{
- uint32_t cntr_members_0;
- ndr_print_struct(ndr, name, "wbint_GroupMembers");
+ uint32_t cntr_principals_0;
+ ndr_print_struct(ndr, name, "wbint_Principals");
ndr->depth++;
- ndr_print_int32(ndr, "num_members", r->num_members);
- ndr->print(ndr, "%s: ARRAY(%d)", "members", (int)r->num_members);
+ ndr_print_int32(ndr, "num_principals", r->num_principals);
+ ndr->print(ndr, "%s: ARRAY(%d)", "principals", (int)r->num_principals);
ndr->depth++;
- for (cntr_members_0=0;cntr_members_0<r->num_members;cntr_members_0++) {
+ for
(cntr_principals_0=0;cntr_principals_0<r->num_principals;cntr_principals_0++) {
char *idx_0=NULL;
- if (asprintf(&idx_0, "[%d]", cntr_members_0) != -1) {
- ndr_print_wbint_GroupMember(ndr, "members",
&r->members[cntr_members_0]);
+ if (asprintf(&idx_0, "[%d]", cntr_principals_0) != -1) {
+ ndr_print_wbint_Principal(ndr, "principals",
&r->principals[cntr_principals_0]);
free(idx_0);
}
}
@@ -1495,7 +1495,7 @@ static enum ndr_err_code
ndr_push_wbint_LookupGroupMembers(struct ndr_push *ndr,
if (r->out.members == NULL) {
return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER,
"NULL [ref] pointer");
}
- NDR_CHECK(ndr_push_wbint_GroupMembers(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.members));
+ NDR_CHECK(ndr_push_wbint_Principals(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.members));
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
}
return NDR_ERR_SUCCESS;
@@ -1525,7 +1525,7 @@ static enum ndr_err_code
ndr_pull_wbint_LookupGroupMembers(struct ndr_pull *ndr,
}
_mem_save_members_0 = NDR_PULL_GET_MEM_CTX(ndr);
NDR_PULL_SET_MEM_CTX(ndr, r->out.members,
LIBNDR_FLAG_REF_ALLOC);
- NDR_CHECK(ndr_pull_wbint_GroupMembers(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.members));
+ NDR_CHECK(ndr_pull_wbint_Principals(ndr,
NDR_SCALARS|NDR_BUFFERS, r->out.members));
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_members_0,
LIBNDR_FLAG_REF_ALLOC);
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
}
@@ -1554,7 +1554,7 @@ _PUBLIC_ void ndr_print_wbint_LookupGroupMembers(struct
ndr_print *ndr, const ch
ndr->depth++;
ndr_print_ptr(ndr, "members", r->out.members);
ndr->depth++;
- ndr_print_wbint_GroupMembers(ndr, "members", r->out.members);
+ ndr_print_wbint_Principals(ndr, "members", r->out.members);
ndr->depth--;
ndr_print_NTSTATUS(ndr, "result", r->out.result);
ndr->depth--;
diff --git a/source3/librpc/gen_ndr/ndr_wbint.h
b/source3/librpc/gen_ndr/ndr_wbint.h
index f6871ad..00b7c54 100644
--- a/source3/librpc/gen_ndr/ndr_wbint.h
+++ b/source3/librpc/gen_ndr/ndr_wbint.h
@@ -45,12 +45,12 @@ void ndr_print_wbint_SidArray(struct ndr_print *ndr, const
char *name, const str
enum ndr_err_code ndr_push_wbint_RidArray(struct ndr_push *ndr, int ndr_flags,
const struct wbint_RidArray *r);
enum ndr_err_code ndr_pull_wbint_RidArray(struct ndr_pull *ndr, int ndr_flags,
struct wbint_RidArray *r);
void ndr_print_wbint_RidArray(struct ndr_print *ndr, const char *name, const
struct wbint_RidArray *r);
-enum ndr_err_code ndr_push_wbint_GroupMember(struct ndr_push *ndr, int
ndr_flags, const struct wbint_GroupMember *r);
-enum ndr_err_code ndr_pull_wbint_GroupMember(struct ndr_pull *ndr, int
ndr_flags, struct wbint_GroupMember *r);
-void ndr_print_wbint_GroupMember(struct ndr_print *ndr, const char *name,
const struct wbint_GroupMember *r);
-enum ndr_err_code ndr_push_wbint_GroupMembers(struct ndr_push *ndr, int
ndr_flags, const struct wbint_GroupMembers *r);
-enum ndr_err_code ndr_pull_wbint_GroupMembers(struct ndr_pull *ndr, int
ndr_flags, struct wbint_GroupMembers *r);
-void ndr_print_wbint_GroupMembers(struct ndr_print *ndr, const char *name,
const struct wbint_GroupMembers *r);
+enum ndr_err_code ndr_push_wbint_Principal(struct ndr_push *ndr, int
ndr_flags, const struct wbint_Principal *r);
+enum ndr_err_code ndr_pull_wbint_Principal(struct ndr_pull *ndr, int
ndr_flags, struct wbint_Principal *r);
+void ndr_print_wbint_Principal(struct ndr_print *ndr, const char *name, const
struct wbint_Principal *r);
+enum ndr_err_code ndr_push_wbint_Principals(struct ndr_push *ndr, int
ndr_flags, const struct wbint_Principals *r);
+enum ndr_err_code ndr_pull_wbint_Principals(struct ndr_pull *ndr, int
ndr_flags, struct wbint_Principals *r);
+void ndr_print_wbint_Principals(struct ndr_print *ndr, const char *name, const
struct wbint_Principals *r);
void ndr_print_wbint_Ping(struct ndr_print *ndr, const char *name, int flags,
const struct wbint_Ping *r);
void ndr_print_wbint_LookupSid(struct ndr_print *ndr, const char *name, int
flags, const struct wbint_LookupSid *r);
void ndr_print_wbint_LookupName(struct ndr_print *ndr, const char *name, int
flags, const struct wbint_LookupName *r);
diff --git a/source3/librpc/gen_ndr/srv_wbint.c
b/source3/librpc/gen_ndr/srv_wbint.c
index f8fb320..fcf84fe 100644
--- a/source3/librpc/gen_ndr/srv_wbint.c
+++ b/source3/librpc/gen_ndr/srv_wbint.c
@@ -943,7 +943,7 @@ static bool api_wbint_LookupGroupMembers(pipes_struct *p)
}
ZERO_STRUCT(r->out);
- r->out.members = talloc_zero(r, struct wbint_GroupMembers);
+ r->out.members = talloc_zero(r, struct wbint_Principals);
if (r->out.members == NULL) {
talloc_free(r);
return false;
@@ -1166,7 +1166,7 @@ NTSTATUS rpc_wbint_dispatch(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx, co
case NDR_WBINT_LOOKUPGROUPMEMBERS: {
struct wbint_LookupGroupMembers *r = (struct
wbint_LookupGroupMembers *)_r;
ZERO_STRUCT(r->out);
- r->out.members = talloc_zero(mem_ctx, struct
wbint_GroupMembers);
+ r->out.members = talloc_zero(mem_ctx, struct
wbint_Principals);
if (r->out.members == NULL) {
return NT_STATUS_NO_MEMORY;
}
diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h
index 7ed1fb2..2f1be14 100644
--- a/source3/librpc/gen_ndr/wbint.h
+++ b/source3/librpc/gen_ndr/wbint.h
@@ -28,15 +28,15 @@ struct wbint_RidArray {
uint32_t *rids;/* [size_is(num_rids)] */
}/* [public] */;
-struct wbint_GroupMember {
+struct wbint_Principal {
struct dom_sid sid;
- const char *name;/* [unique,charset(UTF8)] */
enum lsa_SidType type;
+ const char *name;/* [unique,charset(UTF8)] */
}/* [public] */;
-struct wbint_GroupMembers {
- int32_t num_members;
- struct wbint_GroupMember *members;/* [size_is(num_members)] */
+struct wbint_Principals {
+ int32_t num_principals;
+ struct wbint_Principal *principals;/* [size_is(num_principals)] */
}/* [public] */;
@@ -194,7 +194,7 @@ struct wbint_LookupGroupMembers {
} in;
struct {
- struct wbint_GroupMembers *members;/* [ref] */
+ struct wbint_Principals *members;/* [ref] */
NTSTATUS result;
} out;
diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl
index b7a1ce3..8e2611c 100644
--- a/source3/librpc/idl/wbint.idl
+++ b/source3/librpc/idl/wbint.idl
@@ -95,18 +95,18 @@ interface wbint
typedef [public] struct {
dom_sid sid;
- [string,charset(UTF8)] char *name;
lsa_SidType type;
- } wbint_GroupMember;
+ [string,charset(UTF8)] char *name;
+ } wbint_Principal;
typedef [public] struct {
- int num_members;
- [size_is(num_members)] wbint_GroupMember members[];
- } wbint_GroupMembers;
+ int num_principals;
+ [size_is(num_principals)] wbint_Principal principals[];
+ } wbint_Principals;
NTSTATUS wbint_LookupGroupMembers(
[in] dom_sid *sid,
[in] lsa_SidType type,
- [out] wbint_GroupMembers *members
+ [out] wbint_Principals *members
);
}
\ No newline at end of file
diff --git a/source3/winbindd/wb_group_members.c
b/source3/winbindd/wb_group_members.c
index f37641b..705051d 100644
--- a/source3/winbindd/wb_group_members.c
+++ b/source3/winbindd/wb_group_members.c
@@ -39,7 +39,7 @@
struct wb_lookupgroupmem_state {
struct dom_sid sid;
- struct wbint_GroupMembers members;
+ struct wbint_Principals members;
};
static void wb_lookupgroupmem_done(struct tevent_req *subreq);
@@ -100,7 +100,7 @@ static void wb_lookupgroupmem_done(struct tevent_req
*subreq)
static NTSTATUS wb_lookupgroupmem_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
int *num_members,
- struct wbint_GroupMember **members)
+ struct wbint_Principal **members)
{
struct wb_lookupgroupmem_state *state = tevent_req_data(
req, struct wb_lookupgroupmem_state);
@@ -110,8 +110,8 @@ static NTSTATUS wb_lookupgroupmem_recv(struct tevent_req
*req,
return status;
}
- *num_members = state->members.num_members;
- *members = talloc_move(mem_ctx, &state->members.members);
+ *num_members = state->members.num_principals;
+ *members = talloc_move(mem_ctx, &state->members.principals);
return NT_STATUS_OK;
}
@@ -121,10 +121,10 @@ static NTSTATUS wb_lookupgroupmem_recv(struct tevent_req
*req,
struct wb_groups_members_state {
struct tevent_context *ev;
- struct wbint_GroupMember *groups;
+ struct wbint_Principal *groups;
int num_groups;
int next_group;
- struct wbint_GroupMember *all_members;
+ struct wbint_Principal *all_members;
};
static NTSTATUS wb_groups_members_next_subreq(
@@ -135,7 +135,7 @@ static void wb_groups_members_done(struct tevent_req
*subreq);
static struct tevent_req *wb_groups_members_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
int num_groups,
- struct wbint_GroupMember
*groups)
+ struct wbint_Principal *groups)
{
struct tevent_req *req, *subreq;
struct wb_groups_members_state *state;
@@ -170,7 +170,7 @@ static NTSTATUS wb_groups_members_next_subreq(
TALLOC_CTX *mem_ctx, struct tevent_req **psubreq)
{
struct tevent_req *subreq;
- struct wbint_GroupMember *g;
+ struct wbint_Principal *g;
if (state->next_group >= state->num_groups) {
*psubreq = NULL;
@@ -180,8 +180,7 @@ static NTSTATUS wb_groups_members_next_subreq(
g = &state->groups[state->next_group];
state->next_group += 1;
- subreq = wb_lookupgroupmem_send(mem_ctx, state->ev, &g->sid,
- g->type);
+ subreq = wb_lookupgroupmem_send(mem_ctx, state->ev, &g->sid, g->type);
if (subreq == NULL) {
return NT_STATUS_NO_MEMORY;
}
@@ -197,7 +196,7 @@ static void wb_groups_members_done(struct tevent_req
*subreq)
req, struct wb_groups_members_state);
int i, num_all_members;
int num_members = 0;
- struct wbint_GroupMember *members = NULL;
+ struct wbint_Principal *members = NULL;
NTSTATUS status;
status = wb_lookupgroupmem_recv(subreq, state, &num_members,
@@ -217,14 +216,14 @@ static void wb_groups_members_done(struct tevent_req
*subreq)
num_all_members = talloc_array_length(state->all_members);
state->all_members = talloc_realloc(
- state, state->all_members, struct wbint_GroupMember,
+ state, state->all_members, struct wbint_Principal,
num_all_members + num_members);
if ((num_all_members + num_members != 0)
&& tevent_req_nomem(state->all_members, req)) {
return;
}
for (i=0; i<num_members; i++) {
- struct wbint_GroupMember *src, *dst;
+ struct wbint_Principal *src, *dst;
src = &members[i];
dst = &state->all_members[num_all_members + i];
sid_copy(&dst->sid, &src->sid);
@@ -248,7 +247,7 @@ static void wb_groups_members_done(struct tevent_req
*subreq)
static NTSTATUS wb_groups_members_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
int *num_members,
- struct wbint_GroupMember **members)
+ struct wbint_Principal **members)
{
struct wb_groups_members_state *state = tevent_req_data(
req, struct wb_groups_members_state);
@@ -273,7 +272,7 @@ struct wb_group_members_state {
struct tevent_context *ev;
int depth;
struct talloc_dict *users;
- struct wbint_GroupMember *groups;
+ struct wbint_Principal *groups;
};
static NTSTATUS wb_group_members_next_subreq(
@@ -303,7 +302,7 @@ struct tevent_req *wb_group_members_send(TALLOC_CTX
*mem_ctx,
return tevent_req_post(req, ev);
}
- state->groups = talloc(state, struct wbint_GroupMember);
+ state->groups = talloc(state, struct wbint_Principal);
if (tevent_req_nomem(state->groups, req)) {
return tevent_req_post(req, ev);
}
@@ -355,7 +354,7 @@ static void wb_group_members_done(struct tevent_req *subreq)
req, struct wb_group_members_state);
int i, num_groups, new_users, new_groups;
int num_members = 0;
- struct wbint_GroupMember *members = NULL;
+ struct wbint_Principal *members = NULL;
NTSTATUS status;
status = wb_groups_members_recv(subreq, state, &num_members, &members);
@@ -381,7 +380,7 @@ static void wb_group_members_done(struct tevent_req *subreq)
num_groups = 0;
TALLOC_FREE(state->groups);
- state->groups = talloc_array(state, struct wbint_GroupMember,
+ state->groups = talloc_array(state, struct wbint_Principal,
new_groups);
/*
@@ -396,11 +395,11 @@ static void wb_group_members_done(struct tevent_req
*subreq)
/*
* Add a copy of members[i] to state->users
*/
- struct wbint_GroupMember *m;
+ struct wbint_Principal *m;
struct dom_sid *sid;
DATA_BLOB key;
- m = talloc(talloc_tos(), struct wbint_GroupMember);
+ m = talloc(talloc_tos(), struct wbint_Principal);
if (tevent_req_nomem(m, req)) {
return;
}
--
Samba Shared Repository
