diff options
| author | Andreas Schneider <asn@samba.org> | 2017-08-22 17:10:01 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2017-09-16 00:57:24 +0200 |
| commit | bf64939d22d33e26e11e73f41ee2db09a48c8d3c (patch) | |
| tree | ccd9b320f38871898b12198195091942dd537770 /source4/dns_server/dlz_bind9.c | |
| parent | 1c29a8b3477cd2c030ee21465e0d4a9ec943b590 (diff) | |
| download | samba-bf64939d22d33e26e11e73f41ee2db09a48c8d3c.tar.gz | |
s4:bind_dlz: Try the 'binddns dir' first
The directory is normally empty if you did not provision or call
samba_upgradedns for the bind_dlz module.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12957
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source4/dns_server/dlz_bind9.c')
| -rw-r--r-- | source4/dns_server/dlz_bind9.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c index 8e0820ddd77..9bf1b611fbb 100644 --- a/source4/dns_server/dlz_bind9.c +++ b/source4/dns_server/dlz_bind9.c @@ -682,9 +682,9 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname, } if (state->options.url == NULL) { - state->options.url = lpcfg_private_path(state, - state->lp, - "dns/sam.ldb"); + state->options.url = talloc_asprintf(state, + "%s/dns/sam.ldb", + lpcfg_binddns_dir(state->lp)); if (state->options.url == NULL) { result = ISC_R_NOMEMORY; goto failed; @@ -693,7 +693,7 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname, if (!file_exist(state->options.url)) { state->options.url = talloc_asprintf(state, "%s/dns/sam.ldb", - lpcfg_binddns_dir(state->lp)); + lpcfg_private_dir(state->lp)); if (state->options.url == NULL) { result = ISC_R_NOMEMORY; goto failed; @@ -1322,7 +1322,7 @@ _PUBLIC_ isc_boolean_t dlz_ssumatch(const char *signer, const char *name, const keytab_file = talloc_asprintf(tmp_ctx, "%s/dns.keytab", - lpcfg_private_dir(state->lp)); + lpcfg_binddns_dir(state->lp)); if (keytab_file == NULL) { state->log(ISC_LOG_ERROR, "samba_dlz: Out of memory!"); talloc_free(tmp_ctx); @@ -1332,7 +1332,7 @@ _PUBLIC_ isc_boolean_t dlz_ssumatch(const char *signer, const char *name, const if (!file_exist(keytab_file)) { keytab_file = talloc_asprintf(tmp_ctx, "%s/dns.keytab", - lpcfg_binddns_dir(state->lp)); + lpcfg_private_dir(state->lp)); if (keytab_file == NULL) { state->log(ISC_LOG_ERROR, "samba_dlz: Out of memory!"); talloc_free(tmp_ctx); |