diff options
| -rw-r--r-- | base64.c | 6 | ||||
| -rw-r--r-- | contrib/pull-resolv-conf/client.down | 5 | ||||
| -rw-r--r-- | contrib/pull-resolv-conf/client.up | 5 | ||||
| -rw-r--r-- | options.c | 1 |
4 files changed, 8 insertions, 9 deletions
@@ -80,8 +80,6 @@ base64_encode(const void *data, int size, char **str) return strlen(s); } -#if NTLM - static int pos(char c) { @@ -137,8 +135,6 @@ base64_decode(const char *str, void *data) return q - (unsigned char *) data; } -#endif /* NTLM, PKCS#11 */ - #else static void dummy(void) {} -#endif +#endif /* ENABLE_HTTP_PROXY, ENABLE_PKCS11, ENABLE_CLIENT_CR */ diff --git a/contrib/pull-resolv-conf/client.down b/contrib/pull-resolv-conf/client.down index 38c585b..05f2d4d 100644 --- a/contrib/pull-resolv-conf/client.down +++ b/contrib/pull-resolv-conf/client.down @@ -34,9 +34,10 @@ # A horrid work around, from a security perspective, # is to run OpenVPN as root. THIS IS NOT RECOMMENDED. You have # been WARNED. +PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin -if [ -x /sbin/resolvconf ] ; then - /sbin/resolvconf -d "${1}" +if type resolvconf >/dev/null 2>&1; then + resolvconf -d "${1}" -f elif [ -e /etc/resolv.conf.ovpnsave ] ; then # cp + rm rather than mv in case it's a symlink cp /etc/resolv.conf.ovpnsave /etc/resolv.conf diff --git a/contrib/pull-resolv-conf/client.up b/contrib/pull-resolv-conf/client.up index e81bd3a..b28d4d1 100644 --- a/contrib/pull-resolv-conf/client.up +++ b/contrib/pull-resolv-conf/client.up @@ -33,6 +33,7 @@ # A horrid work around, from a security perspective, # is to run OpenVPN as root. THIS IS NOT RECOMMENDED. You have # been WARNED. +PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin:/usr/local/sbin # init variables @@ -86,8 +87,8 @@ fi out="# resolv.conf autogenerated by ${0} (${1})${nl}${dns}${nl}${ds}${domains}" # use resolvconf if it's available -if [ -x /sbin/resolvconf ] ; then - printf "%s\n" "${out}" | /sbin/resolvconf -a "${1}" +if type resolvconf >/dev/null 2>&1; then + printf "%s\n" "${out}" | resolvconf -p -a "${1}" else # Preserve the existing resolv.conf if [ -e /etc/resolv.conf ] ; then @@ -48,6 +48,7 @@ #include "pool.h" #include "helper.h" #include "manage.h" +#include "forward.h" #include "configure.h" #include <ctype.h> |