mirror of
https://github.com/OpenVPN/openvpn.git
synced 2025-05-09 05:31:05 +08:00
build: autotools: first pass of trivial autotools changes
Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> Acked-by: Adriaan de Jong <dejong@fox-it.com> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com>
This commit is contained in:
Alon Bar-Lev
David Sommerseth
parent
0dbd45db7d
commit
51bd56f46f
24
Makefile.am
24
Makefile.am
@ -23,11 +23,9 @@
|
||||
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
#
|
||||
|
||||
LDADD = @LIBOBJS@
|
||||
|
||||
# This option prevents autoreconf from overriding our COPYING and
|
||||
# INSTALL targets:
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
AUTOMAKE_OPTIONS = foreign 1.9
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
MAINTAINERCLEANFILES = \
|
||||
@ -62,11 +60,22 @@ dist_noinst_SCRIPTS = \
|
||||
t_cltsrv-down.sh \
|
||||
configure_h.awk configure_log.awk
|
||||
|
||||
dist_noinst_DATA = \
|
||||
openvpn.spec \
|
||||
dist_doc_DATA = \
|
||||
COPYRIGHT.GPL \
|
||||
COPYING
|
||||
|
||||
dist_noinst_DATA = \
|
||||
.gitignore \
|
||||
openvpn.spec \
|
||||
PORTS \
|
||||
INSTALL-win32.txt
|
||||
README.IPv6 TODO.IPv6 \
|
||||
README.polarssl \
|
||||
|
||||
if WIN32
|
||||
dist_doc_DATA += INSTALL-win32.txt
|
||||
else
|
||||
dist_noinst_DATA += INSTALL-win32.txt
|
||||
endif
|
||||
|
||||
openvpn_SOURCES = \
|
||||
base64.c base64.h \
|
||||
@ -154,9 +163,6 @@ configure.h: Makefile
|
||||
awk -f $(srcdir)/configure_h.awk config.h > $@
|
||||
awk -f $(srcdir)/configure_log.awk config.log >> $@
|
||||
|
||||
dist-hook:
|
||||
cd $(distdir) && for i in $(EXTRA_DIST) $(SUBDIRS) ; do find $$i -name .svn -type d -prune -exec rm -rf '{}' ';' ; rm -f `find $$i -type f | grep -E '(^|\/)\.?\#|\~$$|\.s?o$$'` ; done
|
||||
|
||||
if WIN32
|
||||
dist_noinst_DATA += openvpn.8
|
||||
nodist_html_DATA = openvpn.8.html
|
||||
|
||||
70
compat.m4
Normal file
70
compat.m4
Normal file
@ -0,0 +1,70 @@
|
||||
dnl OpenVPN -- An application to securely tunnel IP networks
|
||||
dnl over a single UDP port, with support for SSL/TLS-based
|
||||
dnl session authentication and key exchange,
|
||||
dnl packet encryption, packet authentication, and
|
||||
dnl packet compression.
|
||||
dnl
|
||||
dnl Copyright (C) 2008-2012 Alon Bar-Lev <alon.barlev@gmail.com>
|
||||
dnl
|
||||
dnl This program is free software; you can redistribute it and/or modify
|
||||
dnl it under the terms of the GNU General Public License as published by
|
||||
dnl the Free Software Foundation; either version 2 of the License, or
|
||||
dnl (at your option) any later version.
|
||||
dnl
|
||||
dnl This program is distributed in the hope that it will be useful,
|
||||
dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
dnl GNU General Public License for more details.
|
||||
dnl
|
||||
dnl You should have received a copy of the GNU General Public License
|
||||
dnl along with this program (see the file COPYING included with this
|
||||
dnl distribution); if not, write to the Free Software Foundation, Inc.,
|
||||
dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
dnl Compatibility layer for <autoconf-2.60 <automake-1.10
|
||||
dnl REMOVE THIS IN FUTURE!
|
||||
|
||||
ifdef(
|
||||
[AS_VAR_IF],
|
||||
,
|
||||
[
|
||||
AC_DEFUN([AS_VAR_IF], [dnl
|
||||
if test "$$1" = "$2"; then
|
||||
m4_ifval([$3], [$3], [:])
|
||||
else
|
||||
m4_ifval([$4], [$4], [:])
|
||||
fi
|
||||
])
|
||||
]
|
||||
)
|
||||
ifdef(
|
||||
[AC_USE_SYSTEM_EXTENSIONS],
|
||||
,
|
||||
[AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [GNU_SOURCE])]
|
||||
)
|
||||
ifdef(
|
||||
[AC_TYPE_INT8_T],
|
||||
,
|
||||
[
|
||||
AC_CHECK_HEADERS([inttypes.h stdint.h])
|
||||
test -z "${ac_cv_header_inttypes_h}${ac_cv_header_stdint_h}" && \
|
||||
AC_MSG_ERROR([Required inttypes.h stdint.h not found])
|
||||
|
||||
AC_DEFUN([AC_TYPE_INT8_T], [])
|
||||
AC_DEFUN([AC_TYPE_INT16_T], [])
|
||||
AC_DEFUN([AC_TYPE_INT32_T], [])
|
||||
AC_DEFUN([AC_TYPE_INT64_T], [])
|
||||
AC_DEFUN([AC_TYPE_UINT8_T], [])
|
||||
AC_DEFUN([AC_TYPE_UINT16_T], [])
|
||||
AC_DEFUN([AC_TYPE_UINT32_T], [])
|
||||
AC_DEFUN([AC_TYPE_UINT64_T], [])
|
||||
]
|
||||
)
|
||||
if test -z "${docdir}"; then
|
||||
docdir="\$(datadir)/doc/\$(PACKAGE_NAME)"
|
||||
AC_SUBST([docdir])
|
||||
fi
|
||||
if test -z "${htmldir}"; then
|
||||
htmldir="\$(docdir)"
|
||||
AC_SUBST([htmldir])
|
||||
fi
|
||||
1239
configure.ac
1239
configure.ac
File diff suppressed because it is too large
Load Diff
2
lladdr.c
2
lladdr.c
@ -16,7 +16,7 @@ int set_lladdr(const char *ifname, const char *lladdr,
|
||||
return -1;
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
argv_printf (&argv,
|
||||
"%s link set addr %s dev %s",
|
||||
iproute_path, lladdr, ifname);
|
||||
|
||||
30
misc.c
30
misc.c
@ -39,7 +39,7 @@
|
||||
|
||||
#include "memdbg.h"
|
||||
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
const char *iproute_path = IPROUTE_PATH; /* GLOBAL */
|
||||
#endif
|
||||
|
||||
@ -519,7 +519,7 @@ openvpn_execve (const struct argv *a, const struct env_set *es, const unsigned i
|
||||
|
||||
if (a && a->argv[0])
|
||||
{
|
||||
#if defined(ENABLE_EXECVE)
|
||||
#if defined(ENABLE_FEATURE_EXECVE)
|
||||
if (openvpn_execve_allowed (flags))
|
||||
{
|
||||
if (script_method == SM_EXECVE)
|
||||
@ -651,7 +651,7 @@ openvpn_popen (const struct argv *a, const struct env_set *es)
|
||||
|
||||
if (a && a->argv[0])
|
||||
{
|
||||
#if defined(ENABLE_EXECVE)
|
||||
#if defined(ENABLE_FEATURE_EXECVE)
|
||||
if (script_security >= SSEC_BUILT_IN)
|
||||
{
|
||||
const char *cmd = a->argv[0];
|
||||
@ -1785,28 +1785,6 @@ get_auth_challenge (const char *auth_challenge, struct gc_arena *gc)
|
||||
|
||||
#if AUTO_USERID
|
||||
|
||||
static const char *
|
||||
get_platform_prefix (void)
|
||||
{
|
||||
#if defined(TARGET_LINUX)
|
||||
return "L";
|
||||
#elif defined(TARGET_SOLARIS)
|
||||
return "S";
|
||||
#elif defined(TARGET_OPENBSD)
|
||||
return "O";
|
||||
#elif defined(TARGET_DARWIN)
|
||||
return "M";
|
||||
#elif defined(TARGET_NETBSD)
|
||||
return "N";
|
||||
#elif defined(TARGET_FREEBSD)
|
||||
return "F";
|
||||
#elif defined(WIN32)
|
||||
return "W";
|
||||
#else
|
||||
return "X";
|
||||
#endif
|
||||
}
|
||||
|
||||
void
|
||||
get_user_pass_auto_userid (struct user_pass *up, const char *tag)
|
||||
{
|
||||
@ -1821,7 +1799,7 @@ get_user_pass_auto_userid (struct user_pass *up, const char *tag)
|
||||
|
||||
CLEAR (*up);
|
||||
buf_set_write (&buf, (uint8_t*)up->username, USER_PASS_LEN);
|
||||
buf_printf (&buf, "%s", get_platform_prefix ());
|
||||
buf_printf (&buf, "%s", TARGET_PREFIX);
|
||||
if (get_default_gateway_mac_addr (macaddr))
|
||||
{
|
||||
dmsg (D_AUTO_USERID, "GUPAU: macaddr=%s", format_hex_ex (macaddr, sizeof (macaddr), 0, 1, ":", &gc));
|
||||
|
||||
2
misc.h
2
misc.h
@ -396,7 +396,7 @@ void get_user_pass_auto_userid (struct user_pass *up, const char *tag);
|
||||
/*
|
||||
* /sbin/ip path, may be overridden
|
||||
*/
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
extern const char *iproute_path;
|
||||
#endif
|
||||
|
||||
|
||||
@ -120,14 +120,7 @@ popd
|
||||
|
||||
%install
|
||||
[ %{buildroot} != "/" ] && rm -rf %{buildroot}
|
||||
|
||||
# Install man page
|
||||
%__install -c -d -m 755 %{buildroot}%{_mandir}/man8
|
||||
%__install -c -m 755 %{name}.8 %{buildroot}%{_mandir}/man8
|
||||
|
||||
# Install binary
|
||||
%__install -c -d -m 755 %{buildroot}%{_sbindir}
|
||||
%__install -c -m 755 %{name} %{buildroot}%{_sbindir}
|
||||
%__make install DESTDIR="%{buildroot}"
|
||||
|
||||
# Install init script
|
||||
%if "%{VENDOR}" == "SuSE"
|
||||
@ -211,7 +204,7 @@ fi
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS ChangeLog COPYING COPYRIGHT.GPL INSTALL NEWS PORTS README
|
||||
%{_mandir}/man8/%{name}.8*
|
||||
%{_mandir}
|
||||
%{_sbindir}/%{name}
|
||||
%{_datadir}/%{name}
|
||||
%dir /etc/%{name}
|
||||
|
||||
12
options.c
12
options.c
@ -181,7 +181,7 @@ static const char usage_message[] =
|
||||
"--lladdr hw : Set the link layer address of the tap device.\n"
|
||||
"--topology t : Set --dev tun topology: 'net30', 'p2p', or 'subnet'.\n"
|
||||
"--tun-ipv6 : Build tun link capable of forwarding IPv6 traffic.\n"
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
"--iproute cmd : Use this command instead of default " IPROUTE_PATH ".\n"
|
||||
#endif
|
||||
"--ifconfig l rn : TUN: configure device to use IP address l as a local\n"
|
||||
@ -292,7 +292,7 @@ static const char usage_message[] =
|
||||
" or --fragment max value, whichever is lower.\n"
|
||||
"--sndbuf size : Set the TCP/UDP send buffer size.\n"
|
||||
"--rcvbuf size : Set the TCP/UDP receive buffer size.\n"
|
||||
#if defined(TARGET_LINUX) && defined(HAVE_SO_MARK)
|
||||
#if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK
|
||||
"--mark value : Mark encrypted packets being sent with value. The mark value\n"
|
||||
" can be matched in policy routing and packetfilter rules.\n"
|
||||
#endif
|
||||
@ -1506,7 +1506,7 @@ show_settings (const struct options *o)
|
||||
#endif
|
||||
SHOW_INT (rcvbuf);
|
||||
SHOW_INT (sndbuf);
|
||||
#if defined(TARGET_LINUX) && defined(HAVE_SO_MARK)
|
||||
#if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK
|
||||
SHOW_INT (mark);
|
||||
#endif
|
||||
SHOW_INT (sockflags);
|
||||
@ -3188,7 +3188,7 @@ options_cmp_equal_safe (char *actual, const char *expected, size_t actual_n)
|
||||
if (actual_n > 0)
|
||||
{
|
||||
actual[actual_n - 1] = 0;
|
||||
#ifndef STRICT_OPTIONS_CHECK
|
||||
#ifndef ENABLE_STRICT_OPTIONS_CHECK
|
||||
if (strncmp (actual, expected, 2))
|
||||
{
|
||||
msg (D_SHOW_OCC, "NOTE: Options consistency check may be skewed by version differences");
|
||||
@ -4307,7 +4307,7 @@ add_option (struct options *options,
|
||||
VERIFY_PERMISSION (OPT_P_UP);
|
||||
options->tun_ipv6 = true;
|
||||
}
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
else if (streq (p[0], "iproute") && p[1])
|
||||
{
|
||||
VERIFY_PERMISSION (OPT_P_GENERAL);
|
||||
@ -4798,7 +4798,7 @@ add_option (struct options *options,
|
||||
}
|
||||
else if (streq (p[0], "mark") && p[1])
|
||||
{
|
||||
#if defined(TARGET_LINUX) && defined(HAVE_SO_MARK)
|
||||
#if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK
|
||||
VERIFY_PERMISSION (OPT_P_GENERAL);
|
||||
options->mark = atoi(p[1]);
|
||||
#endif
|
||||
|
||||
18
route.c
18
route.c
@ -1308,8 +1308,8 @@ add_route (struct route *r,
|
||||
goto done;
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
/* FIXME -- add on-link support for CONFIG_FEATURE_IPROUTE */
|
||||
#ifdef ENABLE_IPROUTE
|
||||
/* FIXME -- add on-link support for ENABLE_IPROUTE */
|
||||
argv_printf (&argv, "%s route add %s/%d via %s",
|
||||
iproute_path,
|
||||
network,
|
||||
@ -1330,7 +1330,7 @@ add_route (struct route *r,
|
||||
else
|
||||
argv_printf_cat (&argv, "gw %s", gateway);
|
||||
|
||||
#endif /*CONFIG_FEATURE_IPROUTE*/
|
||||
#endif /*ENABLE_IPROUTE*/
|
||||
argv_msg (D_ROUTE, &argv);
|
||||
status = openvpn_execve_check (&argv, es, 0, "ERROR: Linux route add command failed");
|
||||
|
||||
@ -1566,7 +1566,7 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
|
||||
*/
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
argv_printf (&argv, "%s -6 route add %s/%d dev %s",
|
||||
iproute_path,
|
||||
network,
|
||||
@ -1583,7 +1583,7 @@ add_route_ipv6 (struct route_ipv6 *r6, const struct tuntap *tt, unsigned int fla
|
||||
device);
|
||||
if (r6->metric_defined)
|
||||
argv_printf_cat (&argv, " metric %d", r6->metric);
|
||||
#endif /*CONFIG_FEATURE_IPROUTE*/
|
||||
#endif /*ENABLE_IPROUTE*/
|
||||
argv_msg (D_ROUTE, &argv);
|
||||
status = openvpn_execve_check (&argv, es, 0, "ERROR: Linux route -6/-A inet6 add command failed");
|
||||
|
||||
@ -1717,7 +1717,7 @@ delete_route (struct route *r,
|
||||
goto done;
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
argv_printf (&argv, "%s route del %s/%d",
|
||||
iproute_path,
|
||||
network,
|
||||
@ -1727,7 +1727,7 @@ delete_route (struct route *r,
|
||||
ROUTE_PATH,
|
||||
network,
|
||||
netmask);
|
||||
#endif /*CONFIG_FEATURE_IPROUTE*/
|
||||
#endif /*ENABLE_IPROUTE*/
|
||||
if (r->flags & RT_METRIC_DEFINED)
|
||||
argv_printf_cat (&argv, "metric %d", r->metric);
|
||||
argv_msg (D_ROUTE, &argv);
|
||||
@ -1876,7 +1876,7 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne
|
||||
msg( M_INFO, "delete_route_ipv6(%s/%d)", network, r6->netbits );
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
argv_printf (&argv, "%s -6 route del %s/%d dev %s",
|
||||
iproute_path,
|
||||
network,
|
||||
@ -1888,7 +1888,7 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne
|
||||
network,
|
||||
r6->netbits,
|
||||
device);
|
||||
#endif /*CONFIG_FEATURE_IPROUTE*/
|
||||
#endif /*ENABLE_IPROUTE*/
|
||||
argv_msg (D_ROUTE, &argv);
|
||||
openvpn_execve_check (&argv, es, 0, "ERROR: Linux route -6/-A inet6 del command failed");
|
||||
|
||||
|
||||
4
sig.c
4
sig.c
@ -199,6 +199,7 @@ static int signal_mode; /* GLOBAL */
|
||||
void
|
||||
pre_init_signal_catch (void)
|
||||
{
|
||||
#ifndef WIN32
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
signal_mode = SM_PRE_INIT;
|
||||
signal (SIGINT, signal_handler);
|
||||
@ -208,11 +209,13 @@ pre_init_signal_catch (void)
|
||||
signal (SIGUSR2, SIG_IGN);
|
||||
signal (SIGPIPE, SIG_IGN);
|
||||
#endif /* HAVE_SIGNAL_H */
|
||||
#endif /* WIN32 */
|
||||
}
|
||||
|
||||
void
|
||||
post_init_signal_catch (void)
|
||||
{
|
||||
#ifndef WIN32
|
||||
#ifdef HAVE_SIGNAL_H
|
||||
signal_mode = SM_POST_INIT;
|
||||
signal (SIGINT, signal_handler);
|
||||
@ -222,6 +225,7 @@ post_init_signal_catch (void)
|
||||
signal (SIGUSR2, signal_handler);
|
||||
signal (SIGPIPE, SIG_IGN);
|
||||
#endif /* HAVE_SIGNAL_H */
|
||||
#endif
|
||||
}
|
||||
|
||||
/* called after daemonization to retain signal settings */
|
||||
|
||||
2
socket.c
2
socket.c
@ -782,7 +782,7 @@ socket_set_tcp_nodelay (int sd, int state)
|
||||
static inline void
|
||||
socket_set_mark (int sd, int mark)
|
||||
{
|
||||
#if defined(TARGET_LINUX) && defined(HAVE_SO_MARK)
|
||||
#if defined(TARGET_LINUX) && HAVE_DECL_SO_MARK
|
||||
if (mark && setsockopt (sd, SOL_SOCKET, SO_MARK, &mark, sizeof (mark)) != 0)
|
||||
msg (M_WARN, "NOTE: setsockopt SO_MARK=%d failed", mark);
|
||||
#endif
|
||||
|
||||
45
syshead.h
45
syshead.h
@ -43,10 +43,6 @@
|
||||
# define unlikely(x) (x)
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && !defined(WIN32)
|
||||
#define WIN32
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#include <windows.h>
|
||||
#include <winsock2.h>
|
||||
@ -78,22 +74,15 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef TIME_WITH_SYS_TIME
|
||||
# include <sys/time.h>
|
||||
# include <time.h>
|
||||
#else
|
||||
# ifdef HAVE_SYS_TIME_H
|
||||
# include <sys/time.h>
|
||||
# else
|
||||
# include <time.h>
|
||||
# endif
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_TIME_H
|
||||
#include <time.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
# if defined(TARGET_LINUX) && !defined(_GNU_SOURCE)
|
||||
/* needed for peercred support on glibc-2.8 */
|
||||
# define _GNU_SOURCE
|
||||
# endif
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
@ -121,7 +110,9 @@
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
#ifdef HAVE_INTTYPES_H
|
||||
#include <inttypes.h>
|
||||
#elif defined(HAVE_STDINT_H)
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
@ -487,7 +478,7 @@ socket_defined (const socket_descriptor_t sd)
|
||||
* instead of system()?
|
||||
*/
|
||||
#if defined(HAVE_EXECVE) && defined(HAVE_FORK)
|
||||
#define ENABLE_EXECVE
|
||||
#define ENABLE_FEATURE_EXECVE
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -525,14 +516,14 @@ socket_defined (const socket_descriptor_t sd)
|
||||
/*
|
||||
* Enable deferred authentication?
|
||||
*/
|
||||
#if defined(CONFIGURE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_PLUGIN)
|
||||
#if defined(ENABLE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_PLUGIN)
|
||||
#define PLUGIN_DEF_AUTH
|
||||
#endif
|
||||
#if defined(CONFIGURE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_MANAGEMENT)
|
||||
#if defined(ENABLE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_MANAGEMENT)
|
||||
#define MANAGEMENT_DEF_AUTH
|
||||
#endif
|
||||
#if defined(PLUGIN_DEF_AUTH) || defined(MANAGEMENT_DEF_AUTH)
|
||||
#define ENABLE_DEF_AUTH
|
||||
#if !defined(PLUGIN_DEF_AUTH) && !defined(MANAGEMENT_DEF_AUTH)
|
||||
#undef ENABLE_DEF_AUTH
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -553,14 +544,14 @@ socket_defined (const socket_descriptor_t sd)
|
||||
/*
|
||||
* Enable packet filter?
|
||||
*/
|
||||
#if defined(CONFIGURE_PF) && P2MP_SERVER && defined(ENABLE_PLUGIN) && defined(HAVE_STAT)
|
||||
#if defined(ENABLE_PF) && P2MP_SERVER && defined(ENABLE_PLUGIN) && defined(HAVE_STAT)
|
||||
#define PLUGIN_PF
|
||||
#endif
|
||||
#if defined(CONFIGURE_PF) && P2MP_SERVER && defined(MANAGEMENT_DEF_AUTH)
|
||||
#if defined(ENABLE_PF) && P2MP_SERVER && defined(MANAGEMENT_DEF_AUTH)
|
||||
#define MANAGEMENT_PF
|
||||
#endif
|
||||
#if defined(PLUGIN_PF) || defined(MANAGEMENT_PF)
|
||||
#define ENABLE_PF
|
||||
#if !defined(PLUGIN_PF) && !defined(MANAGEMENT_PF)
|
||||
#undef ENABLE_PF
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
||||
6
tun.c
6
tun.c
@ -673,7 +673,7 @@ do_ifconfig (struct tuntap *tt,
|
||||
|
||||
|
||||
#if defined(TARGET_LINUX)
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
/*
|
||||
* Set the MTU for the device
|
||||
*/
|
||||
@ -761,7 +761,7 @@ do_ifconfig (struct tuntap *tt,
|
||||
}
|
||||
tt->did_ifconfig = true;
|
||||
|
||||
#endif /*CONFIG_FEATURE_IPROUTE*/
|
||||
#endif /*ENABLE_IPROUTE*/
|
||||
#elif defined(TARGET_SOLARIS)
|
||||
|
||||
/* Solaris 2.6 (and 7?) cannot set all parameters in one go...
|
||||
@ -1574,7 +1574,7 @@ close_tun (struct tuntap *tt)
|
||||
struct gc_arena gc = gc_new ();
|
||||
argv_init (&argv);
|
||||
|
||||
#ifdef CONFIG_FEATURE_IPROUTE
|
||||
#ifdef ENABLE_IPROUTE
|
||||
if (is_tun_p2p (tt))
|
||||
{
|
||||
argv_printf (&argv,
|
||||
|
||||
11
version.m4
11
version.m4
@ -1,6 +1,9 @@
|
||||
dnl define the OpenVPN version
|
||||
define(PRODUCT_VERSION,[2.3_alpha1])
|
||||
define([PRODUCT_NAME], [OpenVPN])
|
||||
define([PRODUCT_TARNAME], [openvpn])
|
||||
define([PRODUCT_VERSION], [2.3_alpha1])
|
||||
define([PRODUCT_BUGREPORT], [openvpn-users@lists.sourceforge.net])
|
||||
dnl define the TAP version
|
||||
define(PRODUCT_TAP_WIN_COMPONENT_ID,[tap0901])
|
||||
define(PRODUCT_TAP_WIN_MIN_MAJOR,[9])
|
||||
define(PRODUCT_TAP_WIN_MIN_MINOR,[9])
|
||||
define([PRODUCT_TAP_WIN_COMPONENT_ID], [tap0901])
|
||||
define([PRODUCT_TAP_WIN_MIN_MAJOR], [9])
|
||||
define([PRODUCT_TAP_WIN_MIN_MINOR], [9])
|
||||
|
||||
11
win32.h
11
win32.h
@ -51,17 +51,6 @@ void uninit_win32 (void);
|
||||
|
||||
void set_pause_exit_win32 (void);
|
||||
|
||||
/*
|
||||
* Use keyboard input or events
|
||||
* to simulate incoming signals
|
||||
*/
|
||||
|
||||
#define SIGUSR1 1
|
||||
#define SIGUSR2 2
|
||||
#define SIGHUP 3
|
||||
#define SIGTERM 4
|
||||
#define SIGINT 5
|
||||
|
||||
struct security_attributes
|
||||
{
|
||||
SECURITY_ATTRIBUTES sa;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user