[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  17cd3d0... s3: In copy_netr_SamInfo3 copy all of the sids array
      from  7cf0443... s3: Fix a winbind crash

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 17cd3d06cb00db9a94375e00aa42832e25c05726
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Jun 25 16:56:38 2010 +0200

    s3: In copy_netr_SamInfo3 copy all of the sids array

-----------------------------------------------------------------------

Summary of changes:
 source3/auth/server_info.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/server_info.c b/source3/auth/server_info.c
index a43c4f9..bb38080 100644
--- a/source3/auth/server_info.c
+++ b/source3/auth/server_info.c
@@ -551,6 +551,7 @@ struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 	}
 
 	if (orig->sidcount) {
+		info3->sidcount = orig->sidcount;
 		info3->sids = talloc_array(info3, struct netr_SidAttr,
 					   orig->sidcount);
 		RET_NOMEM(info3->sids);
@@ -558,6 +559,8 @@ struct netr_SamInfo3 *copy_netr_SamInfo3(TALLOC_CTX *mem_ctx,
 			info3->sids[i].sid = sid_dup_talloc(info3->sids,
 							    orig->sids[i].sid);
 			RET_NOMEM(info3->sids[i].sid);
+			info3->sids[i].attributes =
+				orig->sids[i].attributes;
 		}
 	}
 


-- 
Samba Shared Repository