diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-12-13 14:23:44 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-12-17 13:55:12 -0500 |
| commit | 77843d3a4cec6c4c546be9120e3c0d9e6a887b34 (patch) | |
| tree | 458751b1d456ad7f0a4a5fcecade250dbcc27dfe | |
| parent | 79cfe1acf3ddc85708f47bb2b6ff031aed7199e3 (diff) | |
| download | isc-dhcp-77843d3a4cec6c4c546be9120e3c0d9e6a887b34.tar.gz | |
[#68] Changed omapi-key,ldap-port, and ldap-init-rety to "t" format
modified: RELNOTES
modified: server/stables.c
| -rw-r--r-- | RELNOTES | 6 | ||||
| -rw-r--r-- | server/stables.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -225,6 +225,12 @@ by Eric Young (eay@cryptsoft.com). values (e.g. next-server). [Gitlab #28] +- The option format for the server options omapi-key, ldap-port, and + ldap-init-retry, has been changed from "d" (domain-name) to "t" (text). + These three options inadvertantly broken when the "d" format content + was changed to comply with RFC 1035 wire format (see Gitlab #2). + [Gitlab #68] + Changes since 4.4.0 (New Features) - none Changes since 4.4.0 (Bug Fixes) diff --git a/server/stables.c b/server/stables.c index d0d9fc36..525b3524 100644 --- a/server/stables.c +++ b/server/stables.c @@ -211,7 +211,7 @@ static struct option server_options[] = { { "limited-broadcast-address", "I", &server_universe, 33, 1 }, { "remote-port", "S", &server_universe, 34, 1 }, { "local-address", "I", &server_universe, 35, 1 }, - { "omapi-key", "d", &server_universe, 36, 1 }, + { "omapi-key", "t", &server_universe, 36, 1 }, { "stash-agent-options", "f", &server_universe, 37, 1 }, { "ddns-ttl", "T", &server_universe, 38, 1 }, { "ddns-update-style", "Nddns-styles.", &server_universe, 39, 1 }, @@ -241,7 +241,7 @@ static struct option server_options[] = { #endif #if defined(LDAP_CONFIGURATION) { "ldap-server", "t", &server_universe, 60, 1 }, - { "ldap-port", "d", &server_universe, 61, 1 }, + { "ldap-port", "t", &server_universe, 61, 1 }, { "ldap-username", "t", &server_universe, 62, 1 }, { "ldap-password", "t", &server_universe, 63, 1 }, { "ldap-base-dn", "t", &server_universe, 64, 1 }, @@ -259,7 +259,7 @@ static struct option server_options[] = { { "ldap-tls-crlcheck", "Nldap-tls-crlcheck.", &server_universe, 75, 1 }, { "ldap-tls-ciphers", "t", &server_universe, 76, 1 }, { "ldap-tls-randfile", "t", &server_universe, 77, 1 }, - { "ldap-init-retry", "d", &server_universe, SV_LDAP_INIT_RETRY, 1 }, + { "ldap-init-retry", "t", &server_universe, SV_LDAP_INIT_RETRY, 1 }, #endif /* LDAP_USE_SSL */ #if defined(LDAP_USE_GSSAPI) { "ldap-gssapi-keytab", "t", &server_universe, SV_LDAP_GSSAPI_KEYTAB, 1}, |