mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 06:45:27 +00:00
Code Issues Releases Wiki Activity

[master] Implement and use new option format type 'k'

Browse Source 
Merges in #68.
This commit is contained in:
Thomas Markwalder
2019-12-17 13:59:24 -05:00
parent 79cfe1acf3
commit 9a2f9db55f
11 changed files with 59 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/stables.c
View File

@@ -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", "k", &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", "L", &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", "L", &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},