svn commit: samba r8982 - in branches/SAMBA_4_0/source/rpc_server/lsa: .

[abartlet at samba.org]

Author: abartlet
Date: 2005-08-03 05:25:30 +0000 (Wed, 03 Aug 2005)
New Revision: 8982

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8982

Log:
"name" is not the netbios name, but the RDN.  Return the correct
netbios domain name of the host, as well as the sid from the cache we
fetched earlier.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c


Changeset:
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c	2005-08-03 05:24:13 UTC (rev 8981)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c	2005-08-03 05:25:30 UTC (rev 8982)
@@ -360,18 +360,9 @@
 static NTSTATUS lsa_info_AccountDomain(struct lsa_policy_state *state, TALLOC_CTX *mem_ctx,
 				       struct lsa_DomainInfo *info)
 {
-	const char * const attrs[] = { "objectSid", "name", NULL};
-	int ret;
-	struct ldb_message **res;
+	info->name.string = state->domain_name;
+	info->sid         = state->domain_sid;
 
-	ret = gendb_search_dn(state->sam_ldb, mem_ctx, state->domain_dn, &res, attrs);
-	if (ret != 1) {
-		return NT_STATUS_INTERNAL_DB_CORRUPTION;
-	}
-
-	info->name.string = samdb_result_string(res[0], "name", NULL);
-	info->sid         = samdb_result_dom_sid(mem_ctx, res[0], "objectSid");
-
 	return NT_STATUS_OK;
 }
 
@@ -390,11 +381,11 @@
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
 	}
 
-	info->name.string       = samdb_result_string(res[0],           "name", NULL);
+	info->name.string = state->domain_name;
+	info->sid         = state->domain_sid;
 	info->dns_domain.string = samdb_result_string(res[0],           "dnsDomain", NULL);
 	info->dns_forest.string = samdb_result_string(res[0],           "dnsDomain", NULL);
 	info->domain_guid       = samdb_result_guid(res[0],             "objectGUID");
-	info->sid               = samdb_result_dom_sid(mem_ctx, res[0], "objectSid");
 
 	return NT_STATUS_OK;
 }