diff options
| author | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2020-12-03 10:41:59 +0300 |
|---|---|---|
| committer | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2020-12-03 10:46:44 +0300 |
| commit | 8cd671c8cf4f704922cf421025db1e0d7e57512c (patch) | |
| tree | 26c943a8a5dab6193f1faf2358dd3852d1d12f9b /m4 | |
| parent | 22138fb660545dad0cbf8a1bf7c43adf2d1cae2d (diff) | |
.......PS. [ZBX-18553] increased ssh.run[] item data limit to 512KB for pre-processing, data storage limit still remains at 64KB
Merge in ZBX/zabbix from feature/ZBX-18553-5.0 to release/5.0
* commit '2a9197e15d5d94df5b5efb3977319ccc59021147':
....I..PS. [ZBX-18553] fixed libssh m4 script
.......PS. [ZBX-18553] added performance improvement also when using libssh library
.......PS. [ZBX-18553] style fix
.......PS. [ZBX-18553] improved performance by using memcpy instead of strcpy when length is known
.......PS. [ZBX-18553] improved performance by using memcpy instead of strcpy when length is known; improved performance by avoiding strdup and reusing already allocated string; improved error handling by making item unsupported when limit is exceeded instead of silently trimming
.......PS. [ZBX-18553] minor log entry improvement
.D........ [ZBX-18553] added ChangeLog entry
.......PS. [ZBX-18553] increased ssh.run[] item data limit to 512KB for pre-processing, data storage limit still remains at 64KB
(cherry picked from commit 8d8482fb8c338c8e50fa53743c1712f7b9fd2d31)
(cherry picked from commit d8ef11d28e22e1d574d4b907904714b10589048f)
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libssh.m4 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/m4/libssh.m4 b/m4/libssh.m4 index 251893b32f8..779e0abc68d 100644 --- a/m4/libssh.m4 +++ b/m4/libssh.m4 @@ -78,7 +78,13 @@ AC_HELP_STRING([--with-ssh@<:@=DIR@:>@],[use SSH package @<:@default=no@:>@, DIR if test "x$want_ssh" = "xyes"; then AC_MSG_CHECKING(for SSH support) if test "x$_libssh_dir" = "xno"; then - if test -f /usr/include/libssh/libssh.h; then + if test -f /usr/include/libssh/libssh_version.h; then + SSH_CFLAGS=-I/usr/include + SSH_LDFLAGS=-L/usr/lib + SSH_LIBS="-lssh" + found_ssh="yes" + LIBSSH_ACCEPT_VERSION([/usr/include/libssh/libssh_version.h]) + elif test -f /usr/include/libssh/libssh.h; then SSH_CFLAGS=-I/usr/include SSH_LDFLAGS=-L/usr/lib SSH_LIBS="-lssh" |