1 files changed, 32 insertions, 10 deletions

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index 2f1f6bce8c2..68f010beea7 100644
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -975,10 +975,10 @@ NTSTATUS _samr_query_dispinfo(pipes_struct *p, SAMR_Q_QUERY_DISPINFO *q_u, SAMR_
 	}
 
 	/* calculate the size and limit on the number of entries we will return */
-	temp_size=(enum_context+max_entries)*struct_size;
+	temp_size=max_entries*struct_size;
 	
 	if (temp_size>max_size) {
-		max_entries=max_size/struct_size;
+		max_entries=MIN((max_size/struct_size),max_entries);
 		DEBUG(5, ("samr_reply_query_dispinfo: buffer size limits to only %d entries\n", max_entries));
 	}
 
@@ -2031,16 +2031,27 @@ NTSTATUS _samr_connect(pipes_struct *p, SAMR_Q_CONNECT *q_u, SAMR_R_CONNECT *r_u
 
 NTSTATUS _samr_lookup_domain(pipes_struct *p, SAMR_Q_LOOKUP_DOMAIN *q_u, SAMR_R_LOOKUP_DOMAIN *r_u)
 {
-    r_u->status = NT_STATUS_OK;
+	fstring domain_name;
+	DOM_SID sid;
+
+	r_u->status = NT_STATUS_OK;
 
-    if (!find_policy_by_hnd(p, &q_u->connect_pol, NULL))
-        return NT_STATUS_INVALID_HANDLE;
+	if (!find_policy_by_hnd(p, &q_u->connect_pol, NULL))
+		return NT_STATUS_INVALID_HANDLE;
 
-    /* assume the domain name sent is our global_myname and
-       send global_sam_sid */
-    init_samr_r_lookup_domain(r_u, &global_sam_sid, r_u->status);
+	fstrcpy(domain_name, dos_unistrn2( q_u->uni_domain.buffer, q_u->uni_domain.uni_str_len));
 
-    return r_u->status;
+	ZERO_STRUCT(sid);
+
+	if (!secrets_fetch_domain_sid(domain_name, &sid)) {
+		r_u->status = NT_STATUS_NO_SUCH_DOMAIN;
+	}
+
+	DEBUG(2,("Returning domain sid for domain %s -> %s\n", domain_name, sid_string_static(&sid)));
+
+	init_samr_r_lookup_domain(r_u, &sid, r_u->status);
+
+	return r_u->status;
 }
 
 /******************************************************************
@@ -2089,10 +2100,21 @@ NTSTATUS _samr_enum_domains(pipes_struct *p, SAMR_Q_ENUM_DOMAINS *q_u, SAMR_R_EN
 {
 	uint32 num_entries = 2;
 	fstring dom[2];
+	char *name;
 
 	r_u->status = NT_STATUS_OK;
 
-	fstrcpy(dom[0],global_myworkgroup);
+	switch (lp_server_role()) {
+		case ROLE_DOMAIN_PDC:
+		case ROLE_DOMAIN_BDC:
+			name = global_myworkgroup;
+			break;
+		default:
+			name = global_myname;
+	}
+
+	fstrcpy(dom[0],name);
+	strupper(dom[0]);
 	fstrcpy(dom[1],"Builtin");
 
 	if (!make_enum_domains(p->mem_ctx, &r_u->sam, &r_u->uni_dom_name, num_entries, dom))