[SCM] Samba Shared Repository - branch v3-2-stable updated - initial-v3-2-test-2708-g59d5e15

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  59d5e15ee50fbae858358aedf0e458b7e4a4af20 (commit)
       via  af7aded25d9007a8c2037940ab90fb30d0a3eef2 (commit)
       via  1081da4d83dbfb6d87c3267c5e00e668b2151294 (commit)
       via  7867f40567503db32dbb13b4fca19792cf198505 (commit)
      from  4c2d6ce18daf07de7233e3e90bd24fa2a5f9e945 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit 59d5e15ee50fbae858358aedf0e458b7e4a4af20
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 13:19:38 2008 +0100

    Fix counter mismatch in lsa_LookupNames3 server.
    
    Guenther
    (cherry picked from commit e052d6f2c82a644986e5d99f640310d71cd5c396)

commit af7aded25d9007a8c2037940ab90fb30d0a3eef2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 13:16:02 2008 +0100

    Fix counter mismatch in lsa_LookupNames server.
    
    Guenther
    (cherry picked from commit 80fd085c34befd38d33cf6e59080a2a36016a92d)

commit 1081da4d83dbfb6d87c3267c5e00e668b2151294
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 12:46:15 2008 +0100

    Fix lsa_QueryInfoPolicy: make proper talloc copies of the sids.
    
    Guenther
    (cherry picked from commit b9441232d66d78e66464be6c9748a023681ce6ca)

commit 7867f40567503db32dbb13b4fca19792cf198505
Author: Günther Deschner <gd at samba.org>
Date:   Tue Mar 4 11:06:02 2008 +0100

    Zero more structs initially in LSA rpc server.
    
    Guenther
    (cherry picked from commit d7ce643285276790a65faff76666498595a508d7)

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

Summary of changes:
 source/rpc_server/srv_lsa_nt.c |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/rpc_server/srv_lsa_nt.c b/source/rpc_server/srv_lsa_nt.c
index ce3fd1a..20c910e 100644
--- a/source/rpc_server/srv_lsa_nt.c
+++ b/source/rpc_server/srv_lsa_nt.c
@@ -82,6 +82,8 @@ static int init_lsa_ref_domain_list(TALLOC_CTX *mem_ctx,
 		return -1;
 	}
 
+	ZERO_STRUCT(ref->domains[num]);
+
 	init_lsa_StringLarge(&ref->domains[num].name, dom_name);
 	ref->domains[num].sid = sid_dup_talloc(mem_ctx, dom_sid);
 	if (!ref->domains[num].sid) {
@@ -228,6 +230,8 @@ static NTSTATUS lookup_lsa_sids(TALLOC_CTX *mem_ctx,
 		const char *domain;
 		enum lsa_SidType type = SID_NAME_UNKNOWN;
 
+		ZERO_STRUCT(sid);
+
 		/* Split name into domain and user component */
 
 		full_name = name[i].string;
@@ -599,15 +603,22 @@ NTSTATUS _lsa_QueryInfoPolicy(pipes_struct *p,
 			case ROLE_DOMAIN_PDC:
 			case ROLE_DOMAIN_BDC:
 				name = get_global_sam_name();
-				sid = get_global_sam_sid();
+				sid = sid_dup_talloc(p->mem_ctx, get_global_sam_sid());
+				if (!sid) {
+					return NT_STATUS_NO_MEMORY;
+				}
 				break;
 			case ROLE_DOMAIN_MEMBER:
 				name = lp_workgroup();
 				/* We need to return the Domain SID here. */
-				if (secrets_fetch_domain_sid(lp_workgroup(), &domain_sid))
-					sid = &domain_sid;
-				else
+				if (secrets_fetch_domain_sid(lp_workgroup(), &domain_sid)) {
+					sid = sid_dup_talloc(p->mem_ctx, &domain_sid);
+					if (!sid) {
+						return NT_STATUS_NO_MEMORY;
+					}
+				} else {
 					return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
+				}
 				break;
 			case ROLE_STANDALONE:
 				name = lp_workgroup();
@@ -1025,10 +1036,10 @@ done:
 		}
 	}
 
-	*r->out.count = num_entries;
+	*r->out.count = mapped_count;
 	*r->out.domains = domains;
 	r->out.sids->sids = rids;
-	r->out.sids->count = mapped_count;
+	r->out.sids->count = num_entries;
 
 	return status;
 }
@@ -1165,10 +1176,10 @@ done:
 		}
 	}
 
-	*r->out.count = num_entries;
+	*r->out.count = mapped_count;
 	*r->out.domains = domains;
 	r->out.sids->sids = trans_sids;
-	r->out.sids->count = mapped_count;
+	r->out.sids->count = num_entries;
 
 	return status;
 }


-- 
Samba Shared Repository