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/init.c | |
| 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/init.c')
| -rw-r--r-- | src/openvpn/init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index eacb67d..292c3a8 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2053,13 +2053,11 @@ do_init_crypto_static (struct context *c, const unsigned int flags) unsigned int rkf_flags = RKF_MUST_SUCCEED; const char *rkf_file = options->shared_secret_file; -#if ENABLE_INLINE_FILES if (options->shared_secret_file_inline) { rkf_file = options->shared_secret_file_inline; rkf_flags |= RKF_INLINE; } -#endif read_key_file (&key2, rkf_file, rkf_flags); } @@ -2153,13 +2151,11 @@ do_init_crypto_tls_c1 (struct context *c) unsigned int flags = 0; const char *file = options->tls_auth_file; -#if ENABLE_INLINE_FILES if (options->tls_auth_file_inline) { flags |= GHK_INLINE; file = options->tls_auth_file_inline; } -#endif get_tls_handshake_key (&c->c1.ks.key_type, &c->c1.ks.tls_auth_key, file, |