diff options
| author | skv <skv@FreeBSD.org> | 2007-12-13 22:42:24 +0800 |
|---|---|---|
| committer | skv <skv@FreeBSD.org> | 2007-12-13 22:42:24 +0800 |
| commit | 9e6d3c1e95a0667fff40af6ab1204bf75ef7c9fe (patch) | |
| tree | 5d4078e965ca03efad5c8d1116641a11f43ada97 /net-mgmt | |
| parent | 41b9cbc1a131d551ae01d167cacda006a3c0fe56 (diff) | |
| download | freebsd-ports-gnome-9e6d3c1e95a0667fff40af6ab1204bf75ef7c9fe.tar.gz freebsd-ports-gnome-9e6d3c1e95a0667fff40af6ab1204bf75ef7c9fe.tar.zst freebsd-ports-gnome-9e6d3c1e95a0667fff40af6ab1204bf75ef7c9fe.zip | |
Fix discovery problem.
Submitted by: Dmitriy Kirhlarov <dimma xx higis.ru>
Diffstat (limited to 'net-mgmt')
| -rw-r--r-- | net-mgmt/zabbix/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix/files/patch-src__zabbix_server__discoverer__discoverer.c | 29 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix2/files/patch-src__zabbix_server__discoverer__discoverer.c | 29 |
4 files changed, 60 insertions, 2 deletions
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index c5fe5533b5b8..009d92a78421 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -7,7 +7,7 @@ PORTNAME= zabbix PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF diff --git a/net-mgmt/zabbix/files/patch-src__zabbix_server__discoverer__discoverer.c b/net-mgmt/zabbix/files/patch-src__zabbix_server__discoverer__discoverer.c new file mode 100644 index 000000000000..2c532d39875b --- /dev/null +++ b/net-mgmt/zabbix/files/patch-src__zabbix_server__discoverer__discoverer.c @@ -0,0 +1,29 @@ +--- src/zabbix_server/discoverer/discoverer.c (revision 5170) ++++ src/zabbix_server/discoverer/discoverer.c (revision 5173) +@@ -723,7 +723,7 @@ + + assert(rule); + +- zabbix_log(LOG_LEVEL_DEBUG, "In process_rule(name:%s,range:%s)", ++ zabbix_log(LOG_LEVEL_DEBUG, "In process_rule() [name:%s] [range:%s]", + rule->name, + rule->iprange); + +@@ -805,7 +805,7 @@ + + if( first < 0 || last < 0 ) + { +- zabbix_log(LOG_LEVEL_WARNING, "Wrong format of IP range [%s]", ++ zabbix_log(LOG_LEVEL_WARNING, "Discovery: Wrong format of IP range [%s]", + rule->iprange); + continue; + } +@@ -818,7 +818,7 @@ + case 1 : zbx_snprintf(ip, sizeof(ip), "%s%x", prefix, i); break; + } + +- zabbix_log(LOG_LEVEL_DEBUG, "Discovery: process_rule() [first %d] [last %d] [IP %s]", prefix, first, last, ip); ++ zabbix_log(LOG_LEVEL_DEBUG, "Discovery: process_rule() [IP:%s]", ip); + + result = DBselect("select dcheckid,druleid,type,key_,snmp_community,ports from dchecks where druleid=" ZBX_FS_UI64, + rule->druleid); diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile index c5fe5533b5b8..009d92a78421 100644 --- a/net-mgmt/zabbix2/Makefile +++ b/net-mgmt/zabbix2/Makefile @@ -7,7 +7,7 @@ PORTNAME= zabbix PORTVERSION= 1.4.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= SF diff --git a/net-mgmt/zabbix2/files/patch-src__zabbix_server__discoverer__discoverer.c b/net-mgmt/zabbix2/files/patch-src__zabbix_server__discoverer__discoverer.c new file mode 100644 index 000000000000..2c532d39875b --- /dev/null +++ b/net-mgmt/zabbix2/files/patch-src__zabbix_server__discoverer__discoverer.c @@ -0,0 +1,29 @@ +--- src/zabbix_server/discoverer/discoverer.c (revision 5170) ++++ src/zabbix_server/discoverer/discoverer.c (revision 5173) +@@ -723,7 +723,7 @@ + + assert(rule); + +- zabbix_log(LOG_LEVEL_DEBUG, "In process_rule(name:%s,range:%s)", ++ zabbix_log(LOG_LEVEL_DEBUG, "In process_rule() [name:%s] [range:%s]", + rule->name, + rule->iprange); + +@@ -805,7 +805,7 @@ + + if( first < 0 || last < 0 ) + { +- zabbix_log(LOG_LEVEL_WARNING, "Wrong format of IP range [%s]", ++ zabbix_log(LOG_LEVEL_WARNING, "Discovery: Wrong format of IP range [%s]", + rule->iprange); + continue; + } +@@ -818,7 +818,7 @@ + case 1 : zbx_snprintf(ip, sizeof(ip), "%s%x", prefix, i); break; + } + +- zabbix_log(LOG_LEVEL_DEBUG, "Discovery: process_rule() [first %d] [last %d] [IP %s]", prefix, first, last, ip); ++ zabbix_log(LOG_LEVEL_DEBUG, "Discovery: process_rule() [IP:%s]", ip); + + result = DBselect("select dcheckid,druleid,type,key_,snmp_community,ports from dchecks where druleid=" ZBX_FS_UI64, + rule->druleid); |