diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2015-01-27 15:19:27 +0100 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2015-01-27 15:19:27 +0100 |
| commit | c17342b3a53845b379ce7171f095a3a880c98b98 (patch) | |
| tree | 321e727d52dffe2d274a3ab966b4cb7e65c7d758 /main/openvpn/src/openvpn/error.h | |
| parent | 6b7c74853686fc578884ebca52b1c43be4f839c0 (diff) | |
Update OpenVPN to -master, fix network-change command (closes issue #312)
Diffstat (limited to 'main/openvpn/src/openvpn/error.h')
| -rw-r--r-- | main/openvpn/src/openvpn/error.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/main/openvpn/src/openvpn/error.h b/main/openvpn/src/openvpn/error.h index 1e1f2acf..d5204f3f 100644 --- a/main/openvpn/src/openvpn/error.h +++ b/main/openvpn/src/openvpn/error.h @@ -93,10 +93,6 @@ extern int x_msg_line_num; #define M_ERRNO (1<<8) /* show errno description */ -#ifdef ENABLE_CRYPTO_OPENSSL -# define M_SSL (1<<10) /* show SSL error */ -#endif - #define M_NOMUTE (1<<11) /* don't do mute processing */ #define M_NOPREFIX (1<<12) /* don't show date/time prefix */ #define M_USAGE_SMALL (1<<13) /* fatal options error, call usage_small */ @@ -107,7 +103,6 @@ extern int x_msg_line_num; /* flag combinations which are frequently used */ #define M_ERR (M_FATAL | M_ERRNO) -#define M_SSLERR (M_FATAL | M_SSL) #define M_USAGE (M_USAGE_SMALL | M_NOPREFIX | M_OPTERR) #define M_CLIENT (M_MSG_VIRT_OUT | M_NOMUTE | M_NOIPREFIX) @@ -354,6 +349,12 @@ ignore_sys_error (const int err) return false; } +/** Convert fatal errors to nonfatal, don't touch other errors */ +static inline const unsigned int +nonfatal(const unsigned int err) { + return err & M_FATAL ? (err ^ M_FATAL) | M_NONFATAL : err; +} + #include "errlevel.h" #endif |