View | Details | Raw Unified | Return to bug 29412
Collapse All | Expand All

(-)samba4-4.0.0~rc2.orig/source4/dns_server/dlz_bind9.c (-1 / +8 lines)
 Lines 640-646   _PUBLIC_ isc_result_t dlz_create(const c Link Here 
640
	}
640
	}
641
641
642
	if (state->options.url == NULL) {
642
	if (state->options.url == NULL) {
643
		state->options.url = lpcfg_private_path(state, state->lp, "dns/sam.ldb");
643
		state->options.url = lpcfg_private_path(state, state->lp, "sam.ldb");
644
		if (state->options.url == NULL) {
644
		if (state->options.url == NULL) {
645
			result = ISC_R_NOMEMORY;
645
			result = ISC_R_NOMEMORY;
646
			goto failed;
646
			goto failed;
 Lines 1107-1112   _PUBLIC_ isc_result_t dlz_configure(dns_ Link Here 
1107
	TALLOC_CTX *tmp_ctx;
1107
	TALLOC_CTX *tmp_ctx;
1108
	struct ldb_dn *dn;
1108
	struct ldb_dn *dn;
1109
	int i;
1109
	int i;
1110
	bool zone_found = false;
1110
1111
1111
	state->log(ISC_LOG_INFO, "samba_dlz: starting configure");
1112
	state->log(ISC_LOG_INFO, "samba_dlz: starting configure");
1112
	if (state->writeable_zone == NULL) {
1113
	if (state->writeable_zone == NULL) {
 Lines 1163-1168   _PUBLIC_ isc_result_t dlz_configure(dns_ Link Here 
1163
				return result;
1164
				return result;
1164
			}
1165
			}
1165
			state->log(ISC_LOG_INFO, "samba_dlz: configured writeable zone '%s'", zone);
1166
			state->log(ISC_LOG_INFO, "samba_dlz: configured writeable zone '%s'", zone);
1167
			zone_found = true;
1168
		}
1169
1170
		// skip the application partitions if there is a pre-2k3 zone on the domain partition
1171
		if (!strcmp(zone_prefixes[i], "CN=MicrosoftDNS,CN=System") && zone_found) {
1172
			break;
1166
		}
1173
		}
1167
	}
1174
	}
1168
1175

Return to bug 29412