const char *hostname;
};
+static NTSTATUS make_dc_info_from_cldap_reply(TALLOC_CTX *mem_ctx,
+ uint32_t flags,
+ struct sockaddr_storage *ss,
+ struct NETLOGON_SAM_LOGON_RESPONSE_EX *r,
+ struct netr_DsRGetDCNameInfo **info);
+
/****************************************************************
****************************************************************/
static char *dsgetdcname_cache_key(TALLOC_CTX *mem_ctx, const char *domain)
{
- if (!mem_ctx || !domain) {
+ if (!domain) {
return NULL;
}
static NTSTATUS dsgetdcname_cache_store(TALLOC_CTX *mem_ctx,
const char *domain_name,
- struct netr_DsRGetDCNameInfo *info)
+ const DATA_BLOB *blob)
{
time_t expire_time;
char *key;
bool ret = false;
- DATA_BLOB blob;
- enum ndr_err_code ndr_err;
if (!gencache_init()) {
return NT_STATUS_INTERNAL_DB_ERROR;
expire_time = time(NULL) + DSGETDCNAME_CACHE_TTL;
- ndr_err = ndr_push_struct_blob(&blob, mem_ctx, info,
- (ndr_push_flags_fn_t)ndr_push_netr_DsRGetDCNameInfo);
- if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- return ndr_map_error2ntstatus(ndr_err);
- }
-
if (gencache_lock_entry(key) != 0) {
- data_blob_free(&blob);
return NT_STATUS_LOCK_NOT_GRANTED;
}
- ret = gencache_set_data_blob(key, &blob, expire_time);
- data_blob_free(&blob);
+ ret = gencache_set_data_blob(key, blob, expire_time);
gencache_unlock_entry(key);
/****************************************************************
****************************************************************/
+static NTSTATUS store_cldap_reply(TALLOC_CTX *mem_ctx,
+ uint32_t flags,
+ struct sockaddr_storage *ss,
+ uint32_t nt_version,
+ struct NETLOGON_SAM_LOGON_RESPONSE_EX *r)
+{
+ DATA_BLOB blob;
+ enum ndr_err_code ndr_err;
+ NTSTATUS status;
+ char addr[INET6_ADDRSTRLEN];
+
+ print_sockaddr(addr, sizeof(addr), ss);
+
+ /* FIXME */
+ r->sockaddr_size = 0x10; /* the w32 winsock addr size */
+ r->sockaddr.sockaddr_family = 2; /* AF_INET */
+ r->sockaddr.pdc_ip = talloc_strdup(mem_ctx, addr);
+
+ ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, r,
+ (ndr_push_flags_fn_t)ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX);
+ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
+ return ndr_map_error2ntstatus(ndr_err);
+ }
+
+ if (r->domain) {
+ status = dsgetdcname_cache_store(mem_ctx, r->domain, &blob);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (r->client_site) {
+ sitename_store(r->domain, r->client_site);
+ }
+ }
+ if (r->dns_domain) {
+ status = dsgetdcname_cache_store(mem_ctx, r->dns_domain, &blob);
+ if (!NT_STATUS_IS_OK(status)) {
+ goto done;
+ }
+ if (r->client_site) {
+ sitename_store(r->dns_domain, r->client_site);
+ }
+ }
+
+ status = NT_STATUS_OK;
+
+ done:
+ data_blob_free(&blob);
+
+ return status;
+}
+
+/****************************************************************
+****************************************************************/
+
static NTSTATUS dsgetdcname_cache_refresh(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
const char *domain_name,
struct GUID *domain_guid,
uint32_t flags,
const char *site_name,
struct netr_DsRGetDCNameInfo *info)
{
- struct nbt_cldap_netlogon_5 r;
-
- /* check if matching entry is older then 15 minutes, if yes, send
- * CLDAP/MAILSLOT ping again and store the cached data */
-
- ZERO_STRUCT(r);
-
- if (ads_cldap_netlogon(mem_ctx, info->dc_unc,
- info->domain_name, &r)) {
+ struct netr_DsRGetDCNameInfo *dc_info;
+
+ return dsgetdcname(mem_ctx,
+ msg_ctx,
+ domain_name,
+ domain_guid,
+ site_name,
+ flags | DS_FORCE_REDISCOVERY,
+ &dc_info);
+}
- dsgetdcname_cache_delete(mem_ctx, domain_name);
+/****************************************************************
+****************************************************************/
- return dsgetdcname_cache_store(mem_ctx,
- info->domain_name,
- info);
+static uint32_t get_cldap_reply_server_flags(struct netlogon_samlogon_response *r,
+ uint32_t nt_version)
+{
+ switch (nt_version & 0x0000001f) {
+ case 0:
+ case 1:
+ case 16:
+ case 17:
+ return 0;
+ case 2:
+ case 3:
+ case 18:
+ case 19:
+ return r->data.nt5.server_type;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return r->data.nt5_ex.server_type;
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ case 12:
+ case 13:
+ case 14:
+ case 15:
+ return r->data.nt5_ex.server_type;
+ case 20:
+ case 21:
+ case 22:
+ case 23:
+ case 24:
+ case 25:
+ case 26:
+ case 27:
+ case 28:
+ return r->data.nt5_ex.server_type;
+ case 29:
+ case 30:
+ case 31:
+ return r->data.nt5_ex.server_type;
+ default:
+ return 0;
}
-
- return NT_STATUS_INVALID_NETWORK_RESPONSE;
}
/****************************************************************
****************************************************************/
-#define RETURN_ON_FALSE(x) if (!x) return false;
+#define RETURN_ON_FALSE(x) if (!(x)) return false;
static bool check_cldap_reply_required_flags(uint32_t ret_flags,
uint32_t req_flags)
{
+ if (ret_flags == 0) {
+ return true;
+ }
+
if (req_flags & DS_PDC_REQUIRED)
RETURN_ON_FALSE(ret_flags & NBT_SERVER_PDC);
DATA_BLOB blob;
enum ndr_err_code ndr_err;
struct netr_DsRGetDCNameInfo *info;
+ struct NETLOGON_SAM_LOGON_RESPONSE_EX r;
+ NTSTATUS status;
if (!gencache_init()) {
return NT_STATUS_INTERNAL_DB_ERROR;
return NT_STATUS_NO_MEMORY;
}
- ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, info,
- (ndr_pull_flags_fn_t)ndr_pull_netr_DsRGetDCNameInfo);
+ ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, &r,
+ (ndr_pull_flags_fn_t)ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_EX);
data_blob_free(&blob);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
return ndr_map_error2ntstatus(ndr_err);
}
+ status = make_dc_info_from_cldap_reply(mem_ctx, flags, NULL,
+ &r, &info);
+ if (!NT_STATUS_IS_OK(status)) {
+ return status;
+ }
+
if (DEBUGLEVEL >= 10) {
NDR_PRINT_DEBUG(netr_DsRGetDCNameInfo, info);
}
****************************************************************/
static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
const char *domain_name,
struct GUID *domain_guid,
uint32_t flags,
}
if (expired) {
- status = dsgetdcname_cache_refresh(mem_ctx, domain_name,
+ status = dsgetdcname_cache_refresh(mem_ctx, msg_ctx,
+ domain_name,
domain_guid, flags,
site_name, *info);
if (!NT_STATUS_IS_OK(status)) {
/****************************************************************
****************************************************************/
-static bool check_allowed_required_flags(uint32_t flags)
+static bool check_allowed_required_flags(uint32_t flags,
+ const char *site_name)
{
uint32_t return_type = flags & (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME);
uint32_t offered_type = flags & (DS_IS_FLAT_NAME|DS_IS_DNS_NAME);
debug_dsdcinfo_flags(10, flags);
+ if ((flags & DS_TRY_NEXTCLOSEST_SITE) && site_name) {
+ return false;
+ }
+
if (return_type == (DS_RETURN_FLAT_NAME|DS_RETURN_DNS_NAME)) {
return false;
}
struct ip_service_name *dclist = NULL;
int count = 0;
- if ((!(flags & DS_DIRECTORY_SERVICE_REQUIRED)) &&
- (!(flags & DS_KDC_REQUIRED)) &&
- (!(flags & DS_GC_SERVER_REQUIRED)) &&
- (!(flags & DS_PDC_REQUIRED))) {
- DEBUG(1,("discover_dc_dns: invalid flags\n"));
- return NT_STATUS_INVALID_PARAMETER;
- }
-
if (flags & DS_PDC_REQUIRED) {
status = ads_dns_query_pdc(mem_ctx, domain_name,
&dcs, &numdcs);
status = ads_dns_query_dcs_guid(mem_ctx, domain_name,
domain_guid, &dcs, &numdcs);
} else {
- /* FIXME: ? */
- DEBUG(1,("discover_dc_dns: not enough input\n"));
- status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+ status = ads_dns_query_dcs(mem_ctx, domain_name, site_name,
+ &dcs, &numdcs);
}
if (!NT_STATUS_IS_OK(status)) {
r->port = dcs[count].port;
r->hostname = dcs[count].hostname;
- if (!(flags & DS_IP_REQUIRED)) {
- count++;
- continue;
- }
-
/* If we don't have an IP list for a name, lookup it up */
if (!dcs[i].ss_s) {
* back to netbios lookups is that our DNS server doesn't know
* anything about the DC's -- jerry */
- if (!is_zero_addr(&r->ss)) {
+ if (!is_zero_addr((struct sockaddr *)&r->ss)) {
count++;
continue;
}
}
if (dc_address) {
- info->dc_address = talloc_strdup(mem_ctx, dc_address);
+ if (!(dc_address[0] == '\\' && dc_address[1] == '\\')) {
+ info->dc_address = talloc_asprintf(mem_ctx, "\\\\%s",
+ dc_address);
+ } else {
+ info->dc_address = talloc_strdup(mem_ctx, dc_address);
+ }
NT_STATUS_HAVE_NO_MEMORY(info->dc_address);
}
NT_STATUS_HAVE_NO_MEMORY(info->domain_name);
}
- if (forest_name) {
+ if (forest_name && *forest_name) {
info->forest_name = talloc_strdup(mem_ctx, forest_name);
NT_STATUS_HAVE_NO_MEMORY(info->forest_name);
+ flags |= DS_DNS_FOREST;
}
info->dc_flags = flags;
/****************************************************************
****************************************************************/
+static void map_dc_and_domain_names(uint32_t flags,
+ const char *dc_name,
+ const char *domain_name,
+ const char *dns_dc_name,
+ const char *dns_domain_name,
+ uint32_t *dc_flags,
+ const char **hostname_p,
+ const char **domain_p)
+{
+ switch (flags & 0xf0000000) {
+ case DS_RETURN_FLAT_NAME:
+ if (dc_name && domain_name &&
+ *dc_name && *domain_name) {
+ *hostname_p = dc_name;
+ *domain_p = domain_name;
+ break;
+ }
+ case DS_RETURN_DNS_NAME:
+ default:
+ if (dns_dc_name && dns_domain_name &&
+ *dns_dc_name && *dns_domain_name) {
+ *hostname_p = dns_dc_name;
+ *domain_p = dns_domain_name;
+ *dc_flags |= DS_DNS_DOMAIN | DS_DNS_CONTROLLER;
+ break;
+ }
+ if (dc_name && domain_name &&
+ *dc_name && *domain_name) {
+ *hostname_p = dc_name;
+ *domain_p = domain_name;
+ break;
+ }
+ }
+}
+
+/****************************************************************
+****************************************************************/
+
+static NTSTATUS make_dc_info_from_cldap_reply(TALLOC_CTX *mem_ctx,
+ uint32_t flags,
+ struct sockaddr_storage *ss,
+ struct NETLOGON_SAM_LOGON_RESPONSE_EX *r,
+ struct netr_DsRGetDCNameInfo **info)
+{
+ const char *dc_hostname = NULL;
+ const char *dc_domain_name = NULL;
+ const char *dc_address = NULL;
+ const char *dc_forest = NULL;
+ uint32_t dc_address_type = 0;
+ uint32_t dc_flags = 0;
+ struct GUID *dc_domain_guid = NULL;
+ const char *dc_server_site = NULL;
+ const char *dc_client_site = NULL;
+
+ char addr[INET6_ADDRSTRLEN];
+
+ if (ss) {
+ print_sockaddr(addr, sizeof(addr), ss);
+ dc_address = addr;
+ dc_address_type = DS_ADDRESS_TYPE_INET;
+ }
+
+ if (!ss && r->sockaddr.pdc_ip) {
+ dc_address = r->sockaddr.pdc_ip;
+ dc_address_type = DS_ADDRESS_TYPE_INET;
+ } else {
+ dc_address = r->pdc_name;
+ dc_address_type = DS_ADDRESS_TYPE_NETBIOS;
+ }
+
+ map_dc_and_domain_names(flags,
+ r->pdc_name,
+ r->domain,
+ r->pdc_dns_name,
+ r->dns_domain,
+ &dc_flags,
+ &dc_hostname,
+ &dc_domain_name);
+
+ dc_flags |= r->server_type;
+ dc_forest = r->forest;
+ dc_domain_guid = &r->domain_uuid;
+ dc_server_site = r->server_site;
+ dc_client_site = r->client_site;
+
+ return make_domain_controller_info(mem_ctx,
+ dc_hostname,
+ dc_address,
+ dc_address_type,
+ dc_domain_guid,
+ dc_domain_name,
+ dc_forest,
+ dc_flags,
+ dc_server_site,
+ dc_client_site,
+ info);
+}
+
+/****************************************************************
+****************************************************************/
+
+static uint32_t map_ds_flags_to_nt_version(uint32_t flags)
+{
+ uint32_t nt_version = 0;
+
+ if (flags & DS_PDC_REQUIRED) {
+ nt_version |= NETLOGON_NT_VERSION_PDC;
+ }
+
+ if (flags & DS_GC_SERVER_REQUIRED) {
+ nt_version |= NETLOGON_NT_VERSION_GC;
+ }
+
+ if (flags & DS_TRY_NEXTCLOSEST_SITE) {
+ nt_version |= NETLOGON_NT_VERSION_WITH_CLOSEST_SITE;
+ }
+
+ if (flags & DS_IP_REQUIRED) {
+ nt_version |= NETLOGON_NT_VERSION_IP;
+ }
+
+ return nt_version;
+}
+
+/****************************************************************
+****************************************************************/
+
static NTSTATUS process_dc_dns(TALLOC_CTX *mem_ctx,
const char *domain_name,
uint32_t flags,
{
int i = 0;
bool valid_dc = false;
- struct nbt_cldap_netlogon_5 r;
- const char *dc_hostname, *dc_domain_name;
- const char *dc_address;
- uint32_t dc_address_type;
- uint32_t dc_flags;
+ struct netlogon_samlogon_response *r = NULL;
+ uint32_t nt_version = NETLOGON_NT_VERSION_5 |
+ NETLOGON_NT_VERSION_5EX;
+ uint32_t ret_flags = 0;
+ NTSTATUS status;
- for (i=0; i<num_dcs; i++) {
+ nt_version |= map_ds_flags_to_nt_version(flags);
- ZERO_STRUCT(r);
+ for (i=0; i<num_dcs; i++) {
DEBUG(10,("LDAP ping to %s\n", dclist[i].hostname));
- if ((ads_cldap_netlogon(mem_ctx, dclist[i].hostname,
- domain_name, &r)) &&
- (check_cldap_reply_required_flags(r.server_type, flags))) {
- valid_dc = true;
- break;
+ if (ads_cldap_netlogon(mem_ctx, dclist[i].hostname,
+ domain_name,
+ nt_version,
+ &r))
+ {
+ nt_version = r->ntver;
+ ret_flags = get_cldap_reply_server_flags(r, nt_version);
+
+ if (check_cldap_reply_required_flags(ret_flags, flags)) {
+ valid_dc = true;
+ break;
+ }
}
continue;
return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
}
- dc_flags = r.server_type;
-
- if (flags & DS_RETURN_FLAT_NAME) {
- if (!strlen(r.pdc_name) || !strlen(r.domain)) {
- return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
- }
- dc_hostname = r.pdc_name;
- dc_domain_name = r.domain;
- } else if (flags & DS_RETURN_DNS_NAME) {
- if (!strlen(r.pdc_dns_name) || !strlen(r.dns_domain)) {
- return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
- }
- dc_hostname = r.pdc_dns_name;
- dc_domain_name = r.dns_domain;
- dc_flags |= DS_DNS_DOMAIN | DS_DNS_CONTROLLER;
- } else {
- /* FIXME */
- dc_hostname = r.pdc_dns_name;
- dc_domain_name = r.dns_domain;
- dc_flags |= DS_DNS_DOMAIN | DS_DNS_CONTROLLER;
- }
-
- if (flags & DS_IP_REQUIRED) {
- char addr[INET6_ADDRSTRLEN];
- print_sockaddr(addr, sizeof(addr), &dclist[i].ss);
- dc_address = talloc_asprintf(mem_ctx, "\\\\%s",
- addr);
- dc_address_type = DS_ADDRESS_TYPE_INET;
- } else {
- dc_address = talloc_asprintf(mem_ctx, "\\\\%s",
- r.pdc_name);
- dc_address_type = DS_ADDRESS_TYPE_NETBIOS;
- }
- NT_STATUS_HAVE_NO_MEMORY(dc_address);
-
- if (r.forest) {
- dc_flags |= DS_DNS_FOREST;
+ status = make_dc_info_from_cldap_reply(mem_ctx, flags, &dclist[i].ss,
+ &r->data.nt5_ex, info);
+ if (NT_STATUS_IS_OK(status)) {
+ return store_cldap_reply(mem_ctx, flags, &dclist[i].ss,
+ nt_version, &r->data.nt5_ex);
}
- return make_domain_controller_info(mem_ctx,
- dc_hostname,
- dc_address,
- dc_address_type,
- &r.domain_uuid,
- dc_domain_name,
- r.forest,
- dc_flags,
- r.server_site,
- r.client_site,
- info);
-
+ return status;
}
/****************************************************************
****************************************************************/
static NTSTATUS process_dc_netbios(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
const char *domain_name,
uint32_t flags,
struct ip_service_name *dclist,
struct sockaddr_storage ss;
struct ip_service ip_list;
enum nbt_name_type name_type = NBT_NAME_LOGON;
-
+ NTSTATUS status;
int i;
- const char *dc_hostname, *dc_domain_name;
- const char *dc_address;
- uint32_t dc_address_type;
- uint32_t dc_flags = 0;
const char *dc_name = NULL;
- const char *dc_forest = NULL;
- const char *dc_server_site = NULL;
- const char *dc_client_site = NULL;
- struct GUID *dc_domain_guid = NULL;
fstring tmp_dc_name;
- struct messaging_context *msg_ctx = msg_context(mem_ctx);
- struct nbt_ntlogon_packet *reply = NULL;
+ struct netlogon_samlogon_response *r = NULL;
+ bool store_cache = false;
+ uint32_t nt_version = NETLOGON_NT_VERSION_1 |
+ NETLOGON_NT_VERSION_5 |
+ NETLOGON_NT_VERSION_5EX_WITH_IP;
+
+ if (!msg_ctx) {
+ msg_ctx = msg_context(mem_ctx);
+ }
if (flags & DS_PDC_REQUIRED) {
name_type = NBT_NAME_PDC;
}
+ nt_version |= map_ds_flags_to_nt_version(flags);
+
DEBUG(10,("process_dc_netbios\n"));
for (i=0; i<num_dcs; i++) {
if (send_getdc_request(mem_ctx, msg_ctx,
&dclist[i].ss, domain_name,
- NULL, 11))
+ NULL, nt_version))
{
int k;
- smb_msleep(100);
+ smb_msleep(300);
for (k=0; k<5; k++) {
if (receive_getdc_response(mem_ctx,
&dclist[i].ss,
domain_name,
+ &nt_version,
&dc_name,
- &reply)) {
+ &r)) {
+ store_cache = true;
namecache_store(dc_name, NBT_NAME_SERVER, 1, &ip_list);
- dc_hostname = dc_name;
- dc_domain_name = talloc_strdup_upper(mem_ctx, domain_name);
- NT_STATUS_HAVE_NO_MEMORY(dc_domain_name);
goto make_reply;
}
- smb_msleep(500);
+ smb_msleep(1500);
}
}
&dclist[i].ss,
tmp_dc_name))
{
- dc_hostname = tmp_dc_name;
- dc_domain_name = talloc_strdup_upper(mem_ctx, domain_name);
- namecache_store(tmp_dc_name, NBT_NAME_SERVER, 1, &ip_list);
- goto make_reply;
- }
- }
+ struct NETLOGON_SAM_LOGON_RESPONSE_NT40 logon1;
- return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
+ r = TALLOC_ZERO_P(mem_ctx, struct netlogon_samlogon_response);
+ NT_STATUS_HAVE_NO_MEMORY(r);
- make_reply:
+ ZERO_STRUCT(logon1);
- if (reply && reply->command == NTLOGON_RESPONSE_FROM_PDC2) {
+ nt_version = NETLOGON_NT_VERSION_1;
- dc_flags |= reply->req.reply2.server_type;
- dc_forest = reply->req.reply2.forest;
- dc_server_site = reply->req.reply2.server_site;
- dc_client_site = reply->req.reply2.client_site;
+ logon1.nt_version = nt_version;
+ logon1.server = tmp_dc_name;
+ logon1.domain = talloc_strdup_upper(mem_ctx, domain_name);
+ NT_STATUS_HAVE_NO_MEMORY(logon1.domain);
- dc_domain_guid = &reply->req.reply2.domain_uuid;
+ r->data.nt4 = logon1;
+ r->ntver = nt_version;
+
+ map_netlogon_samlogon_response(r);
+
+ namecache_store(tmp_dc_name, NBT_NAME_SERVER, 1, &ip_list);
- if (flags & DS_RETURN_DNS_NAME) {
- dc_domain_name = reply->req.reply2.dns_domain;
- dc_hostname = reply->req.reply2.pdc_dns_name;
- dc_flags |= DS_DNS_DOMAIN | DS_DNS_CONTROLLER;
- } else if (flags & DS_RETURN_FLAT_NAME) {
- dc_domain_name = reply->req.reply2.domain;
- dc_hostname = reply->req.reply2.pdc_name;
+ goto make_reply;
}
}
- if (flags & DS_IP_REQUIRED) {
- char addr[INET6_ADDRSTRLEN];
- print_sockaddr(addr, sizeof(addr), &dclist[i].ss);
- dc_address = talloc_asprintf(mem_ctx, "\\\\%s", addr);
- dc_address_type = DS_ADDRESS_TYPE_INET;
- } else {
- dc_address = talloc_asprintf(mem_ctx, "\\\\%s", dc_hostname);
- dc_address_type = DS_ADDRESS_TYPE_NETBIOS;
- }
+ return NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
- if (flags & DS_PDC_REQUIRED) {
- dc_flags |= NBT_SERVER_PDC | NBT_SERVER_WRITABLE;
- }
+ make_reply:
- if (dc_forest) {
- dc_flags |= DS_DNS_FOREST;
+ status = make_dc_info_from_cldap_reply(mem_ctx, flags, &dclist[i].ss,
+ &r->data.nt5_ex, info);
+ if (NT_STATUS_IS_OK(status) && store_cache) {
+ return store_cldap_reply(mem_ctx, flags, &dclist[i].ss,
+ nt_version, &r->data.nt5_ex);
}
- return make_domain_controller_info(mem_ctx,
- dc_hostname,
- dc_address,
- dc_address_type,
- dc_domain_guid,
- dc_domain_name,
- dc_forest,
- dc_flags,
- dc_server_site,
- dc_client_site,
- info);
+ return status;
}
/****************************************************************
****************************************************************/
static NTSTATUS dsgetdcname_rediscover(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
const char *domain_name,
struct GUID *domain_guid,
uint32_t flags,
&dclist, &num_dcs);
NT_STATUS_NOT_OK_RETURN(status);
- return process_dc_netbios(mem_ctx, domain_name, flags,
+ return process_dc_netbios(mem_ctx, msg_ctx, domain_name, flags,
dclist, num_dcs, info);
}
&num_dcs);
NT_STATUS_NOT_OK_RETURN(status);
- return process_dc_netbios(mem_ctx, domain_name, flags, dclist,
+ return process_dc_netbios(mem_ctx, msg_ctx, domain_name, flags, dclist,
num_dcs, info);
}
+static bool is_closest_site(struct netr_DsRGetDCNameInfo *info)
+{
+ if (info->dc_flags & DS_SERVER_CLOSEST) {
+ return true;
+ }
+
+ if (!info->client_site_name) {
+ return true;
+ }
+
+ if (!info->dc_site_name) {
+ return false;
+ }
+
+ if (strcmp(info->client_site_name, info->dc_site_name) == 0) {
+ return true;
+ }
+
+ return false;
+}
+
/********************************************************************
dsgetdcname.
********************************************************************/
NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
const char *domain_name,
struct GUID *domain_guid,
const char *site_name,
{
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
struct netr_DsRGetDCNameInfo *myinfo = NULL;
+ char *query_site = NULL;
+ bool first = true;
+ struct netr_DsRGetDCNameInfo *first_info = NULL;
DEBUG(10,("dsgetdcname: domain_name: %s, "
"domain_guid: %s, site_name: %s, flags: 0x%08x\n",
*info = NULL;
- if (!check_allowed_required_flags(flags)) {
+ if (!check_allowed_required_flags(flags, site_name)) {
DEBUG(0,("invalid flags specified\n"));
return NT_STATUS_INVALID_PARAMETER;
}
+ if (!site_name) {
+ query_site = sitename_fetch(domain_name);
+ } else {
+ query_site = SMB_STRDUP(site_name);
+ }
+
if (flags & DS_FORCE_REDISCOVERY) {
goto rediscover;
}
- status = dsgetdcname_cached(mem_ctx, domain_name, domain_guid,
- flags, site_name, &myinfo);
+ status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
+ flags, query_site, &myinfo);
if (NT_STATUS_IS_OK(status)) {
- *info = myinfo;
- return status;
+ goto done;
}
if (flags & DS_BACKGROUND_ONLY) {
- return status;
+ goto done;
}
rediscover:
- status = dsgetdcname_rediscover(mem_ctx, domain_name,
- domain_guid, flags, site_name,
+ status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
+ domain_guid, flags, query_site,
&myinfo);
- if (NT_STATUS_IS_OK(status)) {
- dsgetdcname_cache_store(mem_ctx, domain_name, myinfo);
- *info = myinfo;
+ done:
+ SAFE_FREE(query_site);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ if (!first) {
+ *info = first_info;
+ return NT_STATUS_OK;
+ }
+ return status;
+ }
+
+ if (!first) {
+ TALLOC_FREE(first_info);
+ } else if (!is_closest_site(myinfo)) {
+ first = false;
+ first_info = myinfo;
+ /* TODO: may use the next_closest_site here */
+ query_site = SMB_STRDUP(myinfo->client_site_name);
+ goto rediscover;
}
- return status;
+ *info = myinfo;
+ return NT_STATUS_OK;
}
git.samba.org / ira / wip.git / blobdiff