summaryrefslogtreecommitdiffstats
path: root/src/openvpn/misc.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-06-18 20:39:06 +0200
committerDavid Sommerseth <davids@redhat.com>2012-06-22 12:17:33 +0200
commite0ce897db928340539b58e0fbda6db9080815598 (patch)
treee87cc036a47d81c20617083dc6d07931251288f0 /src/openvpn/misc.c
parent2df1fc83a61e5a67f299eb862a35eea4db7d9fc3 (diff)
downloadopenvpn-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/misc.c')
-rw-r--r--src/openvpn/misc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c
index 2ded9bf..7f72939 100644
--- a/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@ -205,9 +205,7 @@ warn_if_group_others_accessible (const char* filename)
{
#ifndef WIN32
#ifdef HAVE_STAT
-#if ENABLE_INLINE_FILES
if (strcmp (filename, INLINE_FILE_TAG))
-#endif
{
struct stat st;
if (stat (filename, &st))
@@ -1524,7 +1522,6 @@ make_arg_array (const char *first, const char *parms, struct gc_arena *gc)
return (const char **)ret;
}
-#if ENABLE_INLINE_FILES
static const char **
make_inline_array (const char *str, struct gc_arena *gc)
{
@@ -1553,7 +1550,6 @@ make_inline_array (const char *str, struct gc_arena *gc)
ret[i] = NULL;
return (const char **)ret;
}
-#endif
static const char **
make_arg_copy (char **p, struct gc_arena *gc)
@@ -1576,11 +1572,9 @@ const char **
make_extended_arg_array (char **p, struct gc_arena *gc)
{
const int argc = string_array_len ((const char **)p);
-#if ENABLE_INLINE_FILES
if (!strcmp (p[0], INLINE_FILE_TAG) && argc == 2)
return make_inline_array (p[1], gc);
else
-#endif
if (argc == 0)
return make_arg_array (NULL, NULL, gc);
else if (argc == 1)