Attachment #5830 for bug #34326




	}
}

static void shuffle_dc_set_preferred(struct dc_set *list, uint32_t preferred_index)
{
	uint32_t j;

	srandom(time(NULL));

	const char *tmp;
	tmp = list->names[preferred_index];
	list->names[preferred_index] = list->names[0];
	list->names[0] = tmp;

	for (j = list->count - 1; j > 1; j--) {
		uint32_t r;

		r = 1 + random() % j;

		tmp = list->names[j];
		list->names[j] = list->names[r];
		list->names[r] = tmp;
	}
}

/*
  fill a referral type structure
 */

  get the DCs list within a site
 */
static NTSTATUS get_dcs_insite(TALLOC_CTX *ctx, struct ldb_context *ldb,
			       const char *logon_server,
			       struct ldb_dn *sitedn, struct dc_set *list,
			       bool dofqdn)
{

	unsigned int i;
	int ret;
	const char **dc_list;
	uint32_t preferred_index;
	bool preferred_dc = false;

	ret = ldb_search(ldb, ctx, &r, sitedn, LDB_SCOPE_SUBTREE, attrs,
			 "(&(objectClass=server)(serverReference=*))");

			return NT_STATUS_INTERNAL_ERROR;
		}

		char *netbios_name = NULL;
		if (!dofqdn || logon_server != NULL) {
			if (dns == NULL) {
				DEBUG(2,(__location__ ": dNSHostName missing on %s\n",
					 ldb_dn_get_linearized(dn)));
				talloc_free(r);
				return NT_STATUS_INTERNAL_ERROR;
			}

			list->names[list->count] = talloc_strdup(list->names, dns);
			NT_STATUS_HAVE_NO_MEMORY_AND_FREE(list->names[list->count], r);
		} else {
			char *tmp;
			const char *aname = ldb_msg_find_attr_as_string(r2->msgs[0], "sAMAccountName", NULL);
			if (aname == NULL) {
				DEBUG(2,(__location__ ": sAMAccountName missing on %s\n",

				return NT_STATUS_INTERNAL_ERROR;
			}

			netbios_name = talloc_strdup(list->names, aname);
			NT_STATUS_HAVE_NO_MEMORY_AND_FREE(netbios_name, r);

			/* Netbios name is also the sAMAccountName for
			   computer but without the final $ */
			netbios_name[strlen(netbios_name) - 1] = '\0';

			if (logon_server != NULL && strcasecmp(logon_server, netbios_name) == 0) {
				preferred_index = list->count;
				preferred_dc = true;
			}

			if (!dofqdn) {
				list->names[list->count] = netbios_name;
			} else {
				talloc_free(netbios_name);
			}
		}

		if (dofqdn) {
			const char *dns = ldb_msg_find_attr_as_string(r2->msgs[0], "dNSHostName", NULL);
			if (dns == NULL) {
				DEBUG(2,(__location__ ": dNSHostName missing on %s\n",
					 ldb_dn_get_linearized(dn)));
				talloc_free(r);
				return NT_STATUS_INTERNAL_ERROR;
			}

			list->names[list->count] = talloc_strdup(list->names, dns);
			NT_STATUS_HAVE_NO_MEMORY_AND_FREE(list->names[list->count], r);
		}

		list->count++;
		talloc_free(r2);
	}

	if (preferred_dc) {
		shuffle_dc_set_preferred(list, preferred_index);
	} else {
		shuffle_dc_set(list);
	}

	talloc_free(r);
	return NT_STATUS_OK;

  get all DCs
 */
static NTSTATUS get_dcs(TALLOC_CTX *ctx, struct ldb_context *ldb,
			const char *logon_server,
			const char *searched_site, bool need_fqdn,
			struct dc_set ***pset_list, uint32_t flags)
{


		set_list[current_pos]->names = NULL;
		set_list[current_pos]->count = 0;
		status = get_dcs_insite(subctx, ldb, logon_server, sitedn,
					set_list[current_pos], need_fqdn);
		if (!NT_STATUS_IS_OK(status)) {
			DEBUG(2,(__location__ ": Failed to get DC from site %s - %s\n",

			 */
			dn = r->msgs[i]->dn;

			status = get_dcs_insite(subctx, ldb, logon_server, dn,
						set_list[current_pos],
						need_fqdn);
			if (!NT_STATUS_IS_OK(status)) {

 */
static NTSTATUS dodc_referral(struct loadparm_context *lp_ctx,
			      struct ldb_context *sam_ctx,
			      const char *logon_server,
			      const struct tsocket_address *client,
			      struct dfs_GetDFSReferral *r,
			      const char *domain_name)


	site_name = samdb_client_site_name(sam_ctx, r, client_str, NULL);

	status = get_dcs(r, sam_ctx, logon_server, site_name, need_fqdn, &set, 0);
	if (!NT_STATUS_IS_OK(status)) {
		DEBUG(3,("Unable to get list of DCs - %s\n",
			 nt_errstr(status)));

static NTSTATUS dosysvol_referral(struct loadparm_context *lp_ctx,
				  struct ldb_context *sam_ctx,
				  const struct tsocket_address *client,
				  const char *logon_server,
				  struct dfs_GetDFSReferral *r,
				  const char *domain_name,
				  const char *dfs_name)


	site_name = samdb_client_site_name(sam_ctx, r, client_str, NULL);

	status = get_dcs(r, sam_ctx, logon_server, site_name, need_fqdn, &set, 0);
	if (!NT_STATUS_IS_OK(status)) {
		DEBUG(3,("Unable to get list of DCs - %s\n",
			 nt_errstr(status)));

*/
NTSTATUS dfs_server_ad_get_referrals(struct loadparm_context *lp_ctx,
				     struct ldb_context *sam_ctx,
				     const char *logon_server,
				     const struct tsocket_address *client,
				     struct dfs_GetDFSReferral *r)
{

	 * be just a sysvol/netlogon referral.
	 */
	if (dfs_name == NULL) {
		return dodc_referral(lp_ctx, sam_ctx, logon_server,
				     client, r, server_name);
	}


	 */
	if (strcasecmp(dfs_name, "sysvol") == 0 ||
	    strcasecmp(dfs_name, "netlogon") == 0) {
		return dosysvol_referral(lp_ctx, sam_ctx, client, logon_server, r,
					 server_name, dfs_name);
	}


(-)a/samba-4.1.0/dfs_server/dfs_server_ad.h.orig (+1 lines)

Lines 19-23	Link Here

NTSTATUS dfs_server_ad_get_referrals(struct loadparm_context *lp_ctx,

NTSTATUS dfs_server_ad_get_referrals(struct loadparm_context *lp_ctx,

				     struct ldb_context *sam_ctx,

				     struct ldb_context *sam_ctx,

				     const char *logon_server,

				     const struct tsocket_address *client,

				     const struct tsocket_address *client,

				     struct dfs_GetDFSReferral *r);

				     struct dfs_GetDFSReferral *r);

(-)a/samba-4.1.0/source3/modules/vfs_dfs_samba4.c.orig (+1 lines)

Lines 117-122	Link Here

117

118

	status = dfs_server_ad_get_referrals(data->lp_ctx,

118

	status = dfs_server_ad_get_referrals(data->lp_ctx,

119

					     data->sam_ctx,

119

					     data->sam_ctx,

120

		   			     handle->conn->session_info->info->logon_server,

120

					     handle->conn->sconn->remote_address,

121

					     handle->conn->sconn->remote_address,

121

r);

122

r);

122

	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

123

	if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {

(-)a/samba-4.1.0/source4/smb_server/smb/trans2.c.orig (+1 lines)

Lines 899-904	Link Here

899

		   (unsigned int)strlen_m(r->in.req.servername)*2));

899

		   (unsigned int)strlen_m(r->in.req.servername)*2));

900

901

	status = dfs_server_ad_get_referrals(lp_ctx, ldb,

901

	status = dfs_server_ad_get_referrals(lp_ctx, ldb,

902

				NULL,

902

				req->smb_conn->connection->remote_address, r);

903

				req->smb_conn->connection->remote_address, r);

903

	if (!NT_STATUS_IS_OK(status)) {

904

	if (!NT_STATUS_IS_OK(status)) {

904

		talloc_free(r);

905

		talloc_free(r);

Return to bug 34326