|
 |
29882e |
From ba828bdd09a8203ff6c8e3a2bc66f6af75e3330a Mon Sep 17 00:00:00 2001
|
|
|
29882e |
From: rpm-build <rpm-build>
|
|
|
29882e |
Date: Mon, 20 Feb 2017 14:19:41 +0100
|
|
|
29882e |
Subject: [PATCH 2/3] Treat passwords like ordinary text, bind 9.9 does not
|
|
|
29882e |
support change 3701. Uses simple cfg_print.
|
|
|
29882e |
|
|
|
29882e |
---
|
|
|
29882e |
src/ldap_helper.c | 2 +-
|
|
|
29882e |
src/settings.c | 4 ++--
|
|
|
29882e |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
29882e |
|
|
|
29882e |
diff --git a/src/ldap_helper.c b/src/ldap_helper.c
|
|
|
29882e |
index 94bd9cf..fb7c67f 100644
|
|
|
29882e |
--- a/src/ldap_helper.c
|
|
|
29882e |
+++ b/src/ldap_helper.c
|
|
|
29882e |
@@ -246,7 +246,7 @@ dyndb_ldap_conf_clauses[] = {
|
|
|
29882e |
{ "krb5_keytab", &cfg_type_qstring, 0 },
|
|
|
29882e |
{ "krb5_principal", &cfg_type_qstring, 0 },
|
|
|
29882e |
{ "ldap_hostname", &cfg_type_qstring, 0 },
|
|
|
29882e |
- { "password", &cfg_type_sstring, 0 },
|
|
|
29882e |
+ { "password", &cfg_type_qstring, 0 },
|
|
|
29882e |
{ "reconnect_interval", &cfg_type_uint32, 0 },
|
|
|
29882e |
{ "sasl_auth_name", &cfg_type_qstring, 0 },
|
|
|
29882e |
{ "sasl_mech", &cfg_type_qstring, 0 },
|
|
|
29882e |
diff --git a/src/settings.c b/src/settings.c
|
|
|
29882e |
index 37e6e5c..8f3ae34 100644
|
|
|
29882e |
--- a/src/settings.c
|
|
|
29882e |
+++ b/src/settings.c
|
|
|
29882e |
@@ -605,7 +605,7 @@ settings_set_fill(const cfg_obj_t *config, settings_set_t *set)
|
|
|
29882e |
/* this avoids additional quotes around the string */
|
|
|
29882e |
str_value = cfg_obj_asstring(cfg_value);
|
|
|
29882e |
} else {
|
|
|
29882e |
- cfg_printx(cfg_value, 0, cfg_printer, buf_value);
|
|
|
29882e |
+ cfg_print(cfg_value, cfg_printer, buf_value);
|
|
|
29882e |
isc_buffer_putmem(buf_value, (unsigned char *)"\0", 1);
|
|
|
29882e |
str_value = isc_buffer_base(buf_value);
|
|
|
29882e |
}
|
|
|
29882e |
@@ -690,7 +690,7 @@ setting_set_parse_conf(isc_mem_t *mctx, const char *name,
|
|
|
29882e |
result = cfg_parse_buffer2(parser, &in_buf, name, cfg_type_conf,
|
|
|
29882e |
&config);
|
|
|
29882e |
if (result == ISC_R_SUCCESS) {
|
|
|
29882e |
- cfg_printx(config, CFG_PRINTER_XKEY, cfg_printer, log_buf);
|
|
|
29882e |
+ cfg_print(config, cfg_printer, log_buf);
|
|
|
29882e |
cfg_obj_log(config, dns_lctx, ISC_LOG_DEBUG(10),
|
|
|
29882e |
"configuration for dyndb instance '%s' "
|
|
|
29882e |
"(starting in file %s on line %lu):\n"
|
|
|
29882e |
--
|
|
|
29882e |
2.9.3
|
|
|
29882e |
|