* Merge from Debian testing. Remaining changes: + debian/openvpn.init.d: - Do not use start-stop-daemon and </dev/null to avoid blocking boot. - Show per-VPN result messages. - Add "--script-security 2" by default for backwards compatabliity. + debian/control: Add lsb-base >= 3.2-14 to allow status_of_proc() + debian/update-resolv-conf: Support multiple domains. + fix bug where '--script-security 2' would be passed for all daemons after the first. (LP: #794916)
write_tun (struct tuntap* tt, uint8_t *buf, int len)
3794
3787
{
3795
@@ -1821,6 +2171,7 @@
3788
@@ -1812,6 +2162,7 @@
3796
3789
{
3797
3790
return read (tt->fd, buf, len);
3798
3791
}
3800
3793
3801
3794
#elif defined(TARGET_FREEBSD)
3802
3795
3803
@@ -1834,9 +2185,9 @@
3796
@@ -1825,9 +2176,9 @@
3804
3797
}
3805
3798
3806
3799
void
3812
3805
3813
3806
if (tt->fd >= 0 && tt->type == DEV_TYPE_TUN)
3814
3807
{
3815
@@ -1922,9 +2273,9 @@
3808
@@ -1913,9 +2264,9 @@
3816
3809
}
3817
3810
3818
3811
void
3824
3817
3825
3818
if (tt->fd >= 0)
3826
3819
{
3827
@@ -1993,6 +2344,61 @@
3820
@@ -1984,6 +2335,61 @@
3828
3821
return read (tt->fd, buf, len);
3829
3822
}
3830
3823
3886
3879
#elif defined(WIN32)
3887
3880
3888
3881
int
3889
@@ -3978,7 +4384,7 @@
3882
@@ -3969,7 +4375,7 @@
3890
3883
}
3891
3884
3892
3885
void
3895
3888
{
3896
3889
struct gc_arena gc = gc_new ();
3897
3890
char device_path[256];
3898
@@ -3989,7 +4395,7 @@
3891
@@ -3980,7 +4386,7 @@
3899
3892
3900
3893
/*netcmd_semaphore_lock ();*/
3901
3894
3904
3897
3905
3898
if (tt->type == DEV_TYPE_NULL)
3906
3899
{
3907
@@ -4111,6 +4517,16 @@
3900
@@ -4102,6 +4508,16 @@
3908
3901
msg (M_FATAL, "ERROR: This version of " PACKAGE_NAME " requires a TAP-Win32 driver that is at least version %d.%d -- If you recently upgraded your " PACKAGE_NAME " distribution, a reboot is probably required at this point to get Windows to see the new driver.",