diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-09-02 12:20:00 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2014-09-02 12:20:00 +0200 |
| commit | c1db7b69b6d1d4da34995b32cfd78172d5d015c4 (patch) | |
| tree | cf2a6cf09c8487f58e19f8ffe72e48cda7deccc6 /src/openvpn/options.c | |
| parent | dc7b942f8f182eb26054299fab3b87c6342361fe (diff) | |
| parent | 809daf3b371e0c2457b5d4bd414382eb67bf8348 (diff) | |
Merge tag 'upstream/2.3.4'
Upstream version 2.3.4
Diffstat (limited to 'src/openvpn/options.c')
| -rw-r--r-- | src/openvpn/options.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 7741dbf..1c0edbc 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3436,10 +3436,28 @@ usage_small (void) openvpn_exit (OPENVPN_EXIT_STATUS_USAGE); /* exit point */ } +void +show_library_versions(const unsigned int flags) +{ + msg (flags, "library versions: %s%s%s", +#ifdef ENABLE_SSL + get_ssl_library_version(), +#else + "", +#endif +#ifdef ENABLE_LZO + ", LZO ", lzo_version_string() +#else + "", "" +#endif + ); +} + static void usage_version (void) { msg (M_INFO|M_NOPREFIX, "%s", title_string); + show_library_versions( M_INFO|M_NOPREFIX ); msg (M_INFO|M_NOPREFIX, "Originally developed by James Yonan"); msg (M_INFO|M_NOPREFIX, "Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>"); #ifndef ENABLE_SMALL @@ -4129,7 +4147,7 @@ add_option (struct options *options, read_config_file (options, p[1], level, file, line, msglevel, permission_mask, option_types_found, es); } -#ifdef ENABLE_DEBUG +#if defined(ENABLE_DEBUG) && !defined(ENABLE_SMALL) else if (streq (p[0], "show-gateway")) { struct route_gateway_info rgi; |