diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/starter/args.c | 2 | ||||
| -rw-r--r-- | src/starter/confread.h | 2 | ||||
| -rw-r--r-- | src/starter/keywords.h | 2 | ||||
| -rw-r--r-- | src/starter/keywords.txt | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/starter/args.c b/src/starter/args.c index 5aaf764db..96b5e803d 100644 --- a/src/starter/args.c +++ b/src/starter/args.c @@ -173,8 +173,6 @@ static const token_info_t token_info[] = { ARG_STR, offsetof(starter_ca_t, name), NULL }, { ARG_ENUM, offsetof(starter_ca_t, startup), LST_startup }, { ARG_STR, offsetof(starter_ca_t, cacert), NULL }, - { ARG_STR, offsetof(starter_ca_t, ldaphost), NULL }, - { ARG_STR, offsetof(starter_ca_t, ldapbase), NULL }, { ARG_STR, offsetof(starter_ca_t, crluri), NULL }, { ARG_STR, offsetof(starter_ca_t, crluri2), NULL }, { ARG_STR, offsetof(starter_ca_t, ocspuri), NULL }, diff --git a/src/starter/confread.h b/src/starter/confread.h index 657526679..ea59d44b5 100644 --- a/src/starter/confread.h +++ b/src/starter/confread.h @@ -191,8 +191,6 @@ struct starter_ca { starter_state_t state; char *cacert; - char *ldaphost; - char *ldapbase; char *crluri; char *crluri2; char *ocspuri; diff --git a/src/starter/keywords.h b/src/starter/keywords.h index c053db1d9..9dac6a820 100644 --- a/src/starter/keywords.h +++ b/src/starter/keywords.h @@ -81,8 +81,6 @@ typedef enum { KW_CA_NAME, KW_CA_SETUP, KW_CACERT, - KW_LDAPHOST, - KW_LDAPBASE, KW_CRLURI, KW_CRLURI2, KW_OCSPURI, diff --git a/src/starter/keywords.txt b/src/starter/keywords.txt index 6457f2dd5..2716f21f1 100644 --- a/src/starter/keywords.txt +++ b/src/starter/keywords.txt @@ -72,8 +72,6 @@ mark_in, KW_MARK_IN mark_out, KW_MARK_OUT tfc, KW_TFC cacert, KW_CACERT -ldaphost, KW_LDAPHOST -ldapbase, KW_LDAPBASE crluri, KW_CRLURI crluri1, KW_CRLURI crluri2, KW_CRLURI2 @@ -153,6 +151,8 @@ pkcs11module, KW_PKCS11_DEPRECATED pkcs11initargs, KW_PKCS11_DEPRECATED pkcs11keepstate, KW_PKCS11_DEPRECATED pkcs11proxy, KW_PKCS11_DEPRECATED +ldaphost, KW_CA_DEPRECATED +ldapbase, KW_CA_DEPRECATED pfs, KW_PFS_DEPRECATED pfsgroup, KW_PFS_DEPRECATED eap, KW_CONN_DEPRECATED |