diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-06-18 20:39:06 +0200 |
|---|---|---|
| committer | David Sommerseth <davids@redhat.com> | 2012-06-22 12:17:33 +0200 |
| commit | e0ce897db928340539b58e0fbda6db9080815598 (patch) | |
| tree | e87cc036a47d81c20617083dc6d07931251288f0 /src/openvpn/options.h | |
| parent | 2df1fc83a61e5a67f299eb862a35eea4db7d9fc3 (diff) | |
| download | openvpn-e0ce897db928340539b58e0fbda6db9080815598.tar.gz openvpn-e0ce897db928340539b58e0fbda6db9080815598.tar.xz openvpn-e0ce897db928340539b58e0fbda6db9080815598.zip | |
Remove ENABLE_INLINE_FILES conditionals
This code is always enabled and removing the #ifdef make the code a little bit clearer
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: James Yonan <james@openvpn.net>
Message-Id: 1340044749-10694-4-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/6746
Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'src/openvpn/options.h')
| -rw-r--r-- | src/openvpn/options.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/openvpn/options.h b/src/openvpn/options.h index caa31b2..a2e043d 100644 --- a/src/openvpn/options.h +++ b/src/openvpn/options.h @@ -498,9 +498,7 @@ struct options #ifdef ENABLE_CRYPTO /* Cipher parms */ const char *shared_secret_file; -#if ENABLE_INLINE_FILES const char *shared_secret_file_inline; -#endif int key_direction; bool ciphername_defined; const char *ciphername; @@ -538,14 +536,12 @@ struct options const char *tls_remote; const char *crl_file; -#if ENABLE_INLINE_FILES const char *ca_file_inline; const char *cert_file_inline; const char *extra_certs_file_inline; char *priv_key_file_inline; const char *dh_file_inline; const char *pkcs12_file_inline; /* contains the base64 encoding of pkcs12 file */ -#endif int ns_cert_type; /* set to 0, NS_CERT_CHECK_SERVER, or NS_CERT_CHECK_CLIENT */ unsigned remote_cert_ku[MAX_PARMS]; @@ -592,9 +588,7 @@ struct options /* Special authentication MAC for TLS control channel */ const char *tls_auth_file; /* shared secret */ -#if ENABLE_INLINE_FILES const char *tls_auth_file_inline; -#endif /* Allow only one session */ bool single_session; |