Re: [Openvpn-devel] [PATCH 08/52] cleanup: tun.c: fix incorrect option in message (ip-win32)

[Samuli Seppänen]

> Signed-off-by: Alon Bar-Lev 
> ---
>  tun.c |2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/tun.c b/tun.c
> index c92c0d7..81b66fb 100644
> --- a/tun.c
> +++ b/tun.c
> @@ -4492,7 +4492,7 @@ dhcp_masq_addr (const in_addr_t local, const in_addr_t 
> netmask, const int offset
>  msg (M_FATAL, "ERROR: There is a clash between the --ifconfig local 
> address and the internal DHCP server address -- both are set to %s -- please 
> use the --ip-win32 dynamic option to choose a different free address from the 
> --ifconfig subnet for the internal DHCP server", print_in_addr_t (dsa, 0, 
> ));
>  
>if ((local & netmask) != (dsa & netmask))
> -msg (M_FATAL, "ERROR: --tap-win32 dynamic [offset] : offset is outside 
> of --ifconfig subnet");
> +msg (M_FATAL, "ERROR: --ip-win32 dynamic [offset] : offset is outside of 
> --ifconfig subnet");
>  
>gc_free ();
>return htonl(dsa);

ACK. There is indeed no --tap-win32 option.

-- 
Samuli Seppänen
Community Manager
OpenVPN Technologies, Inc

irc freenode net: mattock

[Openvpn-devel] [PATCH 08/52] cleanup: tun.c: fix incorrect option in message (ip-win32)

[Alon Bar-Lev]

Signed-off-by: Alon Bar-Lev 
---
 tun.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tun.c b/tun.c
index c92c0d7..81b66fb 100644
--- a/tun.c
+++ b/tun.c
@@ -4492,7 +4492,7 @@ dhcp_masq_addr (const in_addr_t local, const in_addr_t 
netmask, const int offset
 msg (M_FATAL, "ERROR: There is a clash between the --ifconfig local 
address and the internal DHCP server address -- both are set to %s -- please 
use the --ip-win32 dynamic option to choose a different free address from the 
--ifconfig subnet for the internal DHCP server", print_in_addr_t (dsa, 0, ));

   if ((local & netmask) != (dsa & netmask))
-msg (M_FATAL, "ERROR: --tap-win32 dynamic [offset] : offset is outside of 
--ifconfig subnet");
+msg (M_FATAL, "ERROR: --ip-win32 dynamic [offset] : offset is outside of 
--ifconfig subnet");

   gc_free ();
   return htonl(dsa);
-- 
1.7.3.4