Attachment #6668 for bug #37687

(-)samba-4.2.0~rc2/source4/setup/dns_update_list.orig (+2 lines)

Lines 37-42	Link Here

${IF_RWDNS_DOMAIN}A    DomainDnsZones.${DNSDOMAIN}                           $IP

${IF_RWDNS_DOMAIN}A    DomainDnsZones.${DNSDOMAIN}                           $IP

${IF_RWDNS_DOMAIN}AAAA DomainDnsZones.${DNSDOMAIN}                           $IP

${IF_RWDNS_DOMAIN}AAAA DomainDnsZones.${DNSDOMAIN}                           $IP

${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.DomainDnsZones.${DNSDOMAIN}                ${HOSTNAME} 389

${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.DomainDnsZones.${DNSDOMAIN}                ${HOSTNAME} 389

${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.pdc._msdcs.DomainDnsZones.${DNSDOMAIN}     ${HOSTNAME} 389

${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.pdc._msdcs.ForestDnsZones.${DNSDOMAIN}     ${HOSTNAME} 389

# RW and RO DNS servers

# RW and RO DNS servers

${IF_DNS_DOMAIN}SRV    _ldap._tcp.${SITE}._sites.DomainDnsZones.${DNSDOMAIN} ${HOSTNAME} 389

${IF_DNS_DOMAIN}SRV    _ldap._tcp.${SITE}._sites.DomainDnsZones.${DNSDOMAIN} ${HOSTNAME} 389

(-)samba-4.2.0~rc2/source4/dsdb/samdb/ldb_modules/partition.c.orig (-1 / +29 lines)

Lines 528-533 static int partition_replicate(struct ld	Link Here

528

	return partition_call_first(ac);

528

	return partition_call_first(ac);

529

530

531

struct Dict {

532

        char *key;

533

        char *val;

534

};

535

531

/* search */

536

/* search */

532

static int partition_search(struct ldb_module *module, struct ldb_request *req)

537

static int partition_search(struct ldb_module *module, struct ldb_request *req)

533

538

Lines 548-553 static int partition_search(struct ldb_m	Link Here

548

	unsigned int i, j;

553

	unsigned int i, j;

549

	int ret;

554

	int ret;

550

	bool domain_scope = false, phantom_root = false;

555

	bool domain_scope = false, phantom_root = false;

556

	struct ldb_result *res;

557

        char * partition_host_domainname;

551

558

552

	p = find_partition(data, NULL, req);

559

	p = find_partition(data, NULL, req);

553

	if (p != NULL) {

560

	if (p != NULL) {

Lines 605-610 static int partition_search(struct ldb_m	Link Here

605

	lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),

612

	lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),

606

						struct loadparm_context);

613

						struct loadparm_context);

607

614

615

	char *forestdnszones_dn = talloc_asprintf(ac, "DC=ForestDnsZones,%s", ldb_dn_get_linearized(ldb_get_default_basedn(ldb)));

616

	char *forestdnszones_fqdn = talloc_asprintf(ac, "ForestDnsZones.%s", lpcfg_dnsdomain(lp_ctx));

617

	char *domaindnszones_dn = talloc_asprintf(ac, "DC=DomainDnsZones,%s", ldb_dn_get_linearized(ldb_get_default_basedn(ldb)));

618

	char *domaindnszones_fqdn = talloc_asprintf(ac, "DomainDnsZones.%s", lpcfg_dnsdomain(lp_ctx));

619

        struct Dict dn_to_fqdn_map[] = {

620

		{ forestdnszones_dn, forestdnszones_fqdn },

621

		{ domaindnszones_dn, domaindnszones_fqdn },

622

		NULL

623

};

624

608

	/* Search from the base DN */

625

	/* Search from the base DN */

609

	if (ldb_dn_is_null(req->op.search.base)) {

626

	if (ldb_dn_is_null(req->op.search.base)) {

610

		if (!phantom_root) {

627

		if (!phantom_root) {

Lines 681-692 static int partition_search(struct ldb_m	Link Here

681

						 data->partitions[i]->ctrl->dn) == 0) &&

698

						 data->partitions[i]->ctrl->dn) == 0) &&

682

			    (ldb_dn_compare(req->op.search.base,

699

			    (ldb_dn_compare(req->op.search.base,

683

					    data->partitions[i]->ctrl->dn) != 0)) {

700

					    data->partitions[i]->ctrl->dn) != 0)) {

701

702

				partition_host_domainname = lpcfg_dnsdomain(lp_ctx);

703

				for (j=0; j<2; j++) {

704

					if (strcasecmp_m(ldb_dn_get_linearized(data->partitions[i]->ctrl->dn), dn_to_fqdn_map[j].key) == 0) {

705

						partition_host_domainname = dn_to_fqdn_map[j].val;

706

						break;

707

708

709

684

				char *ref = talloc_asprintf(ac,

710

				char *ref = talloc_asprintf(ac,

685

							    "ldap://%s/%s%s",

711

							    "ldap://%s/%s%s",

686

							    lpcfg_dnsdomain(lp_ctx),

712

							    partition_host_domainname,

713

							    // lpcfg_dnsdomain(lp_ctx),

687

							    ldb_dn_get_linearized(data->partitions[i]->ctrl->dn),

714

							    ldb_dn_get_linearized(data->partitions[i]->ctrl->dn),

688

							    req->op.search.scope == LDB_SCOPE_ONELEVEL ? "??base" : "");

715

							    req->op.search.scope == LDB_SCOPE_ONELEVEL ? "??base" : "");

689

716

717

690

				if (ref == NULL) {

718

				if (ref == NULL) {

691

					return ldb_oom(ldb);

719

					return ldb_oom(ldb);

692

720




	const char *server_site;
	const char *client_site;
	const char *pdc_ip;
	const char *application_fqdn = NULL;
	struct ldb_dn *domain_dn = NULL;
	struct interface *ifaces;
	bool user_known = false, am_rodc = false;

	}

	/* Lookup using long or short domainname */
	domain_dn = ldb_get_default_basedn(sam_ctx);
	if (domain) {
		if (strcasecmp_m(domain, lpcfg_dnsdomain(lp_ctx)) == 0) {
			domain_dn = ldb_get_default_basedn(sam_ctx);
		} else {
			application_fqdn = talloc_asprintf(mem_ctx, "ForestDnsZones.%s",
							   lpcfg_dnsdomain(lp_ctx));
			if (domain && (strcasecmp_m(domain, application_fqdn) == 0)) {
				domain_dn = ldb_dn_copy(mem_ctx, ldb_get_default_basedn(sam_ctx));
				NT_STATUS_HAVE_NO_MEMORY(domain_dn);
				if (!ldb_dn_add_child_fmt(domain_dn, "DC=ForestDnsZones")) {
					return NT_STATUS_NO_MEMORY;
				}
			} else {
				talloc_free(application_fqdn);
				application_fqdn = talloc_asprintf(mem_ctx, "DomainDnsZones.%s",
								   lpcfg_dnsdomain(lp_ctx));
				if (domain && (strcasecmp_m(domain, application_fqdn) == 0)) {
					domain_dn = ldb_dn_copy(mem_ctx, ldb_get_default_basedn(sam_ctx));
					NT_STATUS_HAVE_NO_MEMORY(domain_dn);
					if (!ldb_dn_add_child_fmt(domain_dn, "DC=DomainDnsZones")) {
						return NT_STATUS_NO_MEMORY;
					}
				} else {
					talloc_free(application_fqdn);
				}
			}
		}
	}
	if (netbios_domain && (strcasecmp_m(netbios_domain, lpcfg_sam_name(lp_ctx)) == 0)) {
		domain_dn = ldb_get_default_basedn(sam_ctx);

	NT_STATUS_HAVE_NO_MEMORY(pdc_dns_name);
	flatname         = lpcfg_workgroup(lp_ctx);

	if (application_fqdn) {
		if (!(version & NETLOGON_NT_VERSION_PDC)) {
			dns_domain = application_fqdn;
			server_type = DS_SERVER_NDNC;
			server_type |= DS_SERVER_WRITABLE;
			server_type |= DS_SERVER_LDAP;
		} else {
			DEBUG(2,("DEBUG: netlogon application_fqdn NETLOGON_NT_VERSION_PDC\n"));
		}
	}

	server_site      = samdb_server_site_name(sam_ctx, mem_ctx);
	NT_STATUS_HAVE_NO_MEMORY(server_site);
	client_site      = samdb_client_site_name(sam_ctx, mem_ctx,

		}
		netlogon->data.nt5_ex.pdc_name     = pdc_name;
		netlogon->data.nt5_ex.user_name    = user;
		if (!application_fqdn) {
			netlogon->data.nt5_ex.domain_name  = flatname;
		}
		netlogon->data.nt5_ex.domain_uuid  = domain_uuid;
		netlogon->data.nt5_ex.forest       = forest_domain;
		netlogon->data.nt5_ex.dns_domain   = dns_domain;

		}
		netlogon->data.nt5.pdc_name     = pdc_name;
		netlogon->data.nt5.user_name    = user;
		if (!application_fqdn) {
			netlogon->data.nt5.domain_name  = flatname;
		}
		netlogon->data.nt5.domain_uuid  = domain_uuid;
		netlogon->data.nt5.forest       = forest_domain;
		netlogon->data.nt5.dns_domain   = dns_domain;

		}
		netlogon->data.nt4.pdc_name    = pdc_name;
		netlogon->data.nt4.user_name   = user;
		if (!application_fqdn) {
			netlogon->data.nt4.domain_name = flatname;
		}
		netlogon->data.nt4.nt_version  = NETLOGON_NT_VERSION_1;
		netlogon->data.nt4.lmnt_token  = 0xFFFF;
		netlogon->data.nt4.lm20_token  = 0xFFFF;

Return to bug 37687