[SCM] Samba Shared Repository - branch v3-4-test updated
Karolin Seeger
kseeger at samba.org
Fri Dec 18 07:53:02 MST 2009
The branch, v3-4-test has been updated
via e4e143e... s3: Fix _samr_GetAliasMembership for results with 0 rids (cherry picked from commit 20bcdf85f16216c45ded886217fedc4516cc591c)
from ce060ae... s3:posix_acls: Fix bug 6841 - "map acl inherit = yes" not working.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit e4e143e8fccc09b6543c4f765d0824f0472f95e9
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 15 14:01:43 2009 +0100
s3: Fix _samr_GetAliasMembership for results with 0 rids
(cherry picked from commit 20bcdf85f16216c45ded886217fedc4516cc591c)
Fix bug #6997 (Fix _samr_GetAliasMembership for results with 0 rids).
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/srv_samr_nt.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 21f4094..ce67759 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -5390,6 +5390,14 @@ NTSTATUS _samr_GetAliasMembership(pipes_struct *p,
r->out.rids->count = num_alias_rids;
r->out.rids->ids = alias_rids;
+ if (r->out.rids->ids == NULL) {
+ /* Windows domain clients don't accept a NULL ptr here */
+ r->out.rids->ids = talloc_zero(p->mem_ctx, uint32_t);
+ }
+ if (r->out.rids->ids == NULL) {
+ return NT_STATUS_NO_MEMORY;
+ }
+
return NT_STATUS_OK;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list