6c70d17185b6be09e63211c37d5b496e48fc8160
diff --git a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
index c7b7976..d2374d5 100644
--- a/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
+++ b/source4/rpc_server/drsuapi/dcesrv_drsuapi.c
@@ -600,7 +600,7 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 	}
 
 	ret = ldb_search(b_state->sam_ctx, mem_ctx, &res, sites_dn, LDB_SCOPE_SUBTREE, attrs,
-				 "objectClass=server");
+			 "(&(objectClass=server)(serverReference=*))");
 	
 	if (ret) {
 		DEBUG(1, ("searching for servers in sites DN %s failed: %s\n", 
@@ -631,7 +631,9 @@ static WERROR dcesrv_drsuapi_DsGetDomainControllerInfo_1(struct drsuapi_bind_sta
 			}
 
 			ret = ldb_search(b_state->sam_ctx, mem_ctx, &res_account, ref_dn,
-						 LDB_SCOPE_BASE, attrs_account_1, "objectClass=computer");
+					 LDB_SCOPE_BASE, attrs_account_1,
+					 "(&(objectClass=computer)(userAccountControl:1.2.840.113556.1.4.803:=%u)",
+					 UF_SERVER_TRUST_ACCOUNT);
 			if (ret == LDB_SUCCESS && res_account->count == 1) {
 				const char *errstr;
 				ctr1->array[i].dns_name