Merge lp://qastaging/~dev-nigelj/ubuntu/oneiric/zabbix/721707 into lp://qastaging/ubuntu/oneiric/zabbix

.pc/applied-patches (+1/-0)
.pc/configure-no-lcrypt/configure (+2315/-2026)
.pc/ldap-linker-lp722300.patch/configure.in (+1492/-0)
.pc/ldap-linker-lp722300.patch/m4/ax_lib_postgresql.m4 (+182/-0)
.pc/ldap-linker-lp722300.patch/m4/ldap.m4 (+97/-0)
.pc/no-swf-clock/frontends/php/include/screens.inc.php (+11/-2)
ChangeLog (+217/-13)
Makefile.am (+3/-8)
Makefile.in (+5/-9)
aclocal.m4 (+1/-0)
build/win32/project/Makefile_agent (+1/-10)
build/win32/project/Makefile_agent_x64 (+1/-10)
build/win64/README (+1/-1)
configure (+2315/-2026)
configure.in (+500/-449)
create/Makefile.am (+3/-1)
create/Makefile.in (+5/-2)
create/data/data.sql (+9/-0)
create/data/images_ibm_db2.sql (+25/-0)
create/schema/ibm_db2.sql (+1075/-0)
debian/changelog (+40/-0)
debian/control (+5/-5)
debian/patches/ldap-linker-lp722300.patch (+54/-0)
debian/patches/series (+1/-0)
debian/po/cs.po (+1/-1)
debian/po/da.po (+105/-0)
debian/po/de.po (+1/-1)
debian/po/es.po (+1/-1)
debian/po/eu.po (+8/-1)
debian/po/fi.po (+1/-1)
debian/po/fr.po (+1/-1)
debian/po/it.po (+1/-1)
debian/po/ja.po (+1/-1)
debian/po/nb.po (+8/-1)
debian/po/nl.po (+16/-1)
debian/po/pl.po (+16/-1)
debian/po/pt.po (+1/-1)
debian/po/pt_BR.po (+1/-1)
debian/po/ru.po (+3/-3)
debian/po/sv.po (+1/-1)
debian/rules (+3/-4)
debian/watch (+1/-0)
frontends/php/acknow.php (+17/-22)
frontends/php/actionconf.php (+107/-136)
frontends/php/api/classes/class.caction.php (+109/-69)
frontends/php/api/classes/class.calert.php (+40/-31)
frontends/php/api/classes/class.capplication.php (+50/-35)
frontends/php/api/classes/class.cdcheck.php (+14/-43)
frontends/php/api/classes/class.cdhost.php (+15/-62)
frontends/php/api/classes/class.cdrule.php (+50/-70)
frontends/php/api/classes/class.cdservice.php (+15/-70)
frontends/php/api/classes/class.cevent.php (+65/-52)
frontends/php/api/classes/class.cgraph.php (+270/-275)
frontends/php/api/classes/class.cgraphitem.php (+36/-11)
frontends/php/api/classes/class.chistory.php (+22/-26)
frontends/php/api/classes/class.chost.php (+141/-118)
frontends/php/api/classes/class.chostgroup.php (+135/-72)
frontends/php/api/classes/class.cimage.php (+70/-36)
frontends/php/api/classes/class.citem.php (+38/-85)
frontends/php/api/classes/class.cmaintenance.php (+149/-49)
frontends/php/api/classes/class.cmap.php (+276/-226)
frontends/php/api/classes/class.cmediatype.php (+50/-87)
frontends/php/api/classes/class.cproxy.php (+32/-20)
frontends/php/api/classes/class.cscreen.php (+63/-41)
frontends/php/api/classes/class.cscript.php (+171/-40)
frontends/php/api/classes/class.ctemplate.php (+198/-117)
frontends/php/api/classes/class.ctrigger.php (+148/-116)
frontends/php/api/classes/class.cuser.php (+119/-125)
frontends/php/api/classes/class.cusergroup.php (+67/-44)
frontends/php/api/classes/class.cusermacro.php (+407/-379)
frontends/php/api/classes/class.czbxapi.php (+3/-2)
frontends/php/api/rpc/class.cjsonrpc.php (+2/-2)
frontends/php/api/rpc/class.czbxrpc.php (+16/-10)
frontends/php/api_jsonrpc.php (+1/-1)
frontends/php/applications.php (+2/-2)
frontends/php/auditacts.php (+4/-3)
frontends/php/auditlogs.php (+2/-30)
frontends/php/chart.php (+0/-1)
frontends/php/chart2.php (+4/-4)
frontends/php/chart3.php (+9/-9)
frontends/php/conf/zabbix.conf.php.example (+13/-28)
frontends/php/config.php (+87/-46)
frontends/php/discovery.php (+21/-3)
frontends/php/discoveryconf.php (+212/-20)
frontends/php/events.php (+7/-6)
frontends/php/graphs.php (+3/-3)
frontends/php/history.php (+2/-2)
frontends/php/hostgroups.php (+73/-28)
frontends/php/hosts.php (+145/-43)
frontends/php/httpconf.php (+225/-21)
frontends/php/httpdetails.php (+13/-12)
frontends/php/imgstore.php (+8/-7)
frontends/php/include/acknow.inc.php (+2/-2)
frontends/php/include/actions.inc.php (+22/-14)
frontends/php/include/audit.inc.php (+39/-31)
frontends/php/include/blocks.inc.php (+13/-9)
frontends/php/include/classes/class.cbutton.php (+1/-1)
frontends/php/include/classes/class.cchart.php (+105/-90)
frontends/php/include/classes/class.ccombobox.php (+26/-9)
frontends/php/include/classes/class.ccomboitem.php (+3/-5)
frontends/php/include/classes/class.cconfigfile.php (+163/-0)
frontends/php/include/classes/class.cformelement.php (+50/-50)
frontends/php/include/classes/class.cformtable.php (+16/-42)
frontends/php/include/classes/class.clabel.php (+30/-0)
frontends/php/include/classes/class.cpagefilter.php (+467/-451)
frontends/php/include/classes/class.cpie.php (+4/-0)
frontends/php/include/classes/class.cstringparser.php (+43/-40)
frontends/php/include/classes/class.ctag.php (+1/-1)
frontends/php/include/classes/class.ctextarea.php (+1/-1)
frontends/php/include/classes/class.ctriggersinfo.php (+4/-11)
frontends/php/include/classes/class.cwidget.php (+1/-1)
frontends/php/include/config.inc.php (+42/-29)
frontends/php/include/db.inc.php (+214/-66)
frontends/php/include/debug.inc.php (+44/-44)
frontends/php/include/defines.inc.php (+26/-8)
frontends/php/include/discovery.inc.php (+55/-48)
frontends/php/include/events.inc.php (+88/-53)
frontends/php/include/export.inc.php (+115/-80)
frontends/php/include/forms.inc.php (+73/-595)
frontends/php/include/func.inc.php (+97/-64)
frontends/php/include/hosts.inc.php (+71/-93)
frontends/php/include/httptest.inc.php (+19/-5)
frontends/php/include/items.inc.php (+253/-12)
frontends/php/include/js.inc.php (+10/-2)
frontends/php/include/locales/en_gb.inc.php (+121/-15)
frontends/php/include/locales/fr_fr.inc.php (+51/-7)
frontends/php/include/locales/lv_lv.inc.php (+169/-0)
frontends/php/include/locales/ru_ru.inc.php (+135/-83)
frontends/php/include/locales/ua_ua.inc.php (+104/-36)
frontends/php/include/maps.inc.php (+674/-985)
frontends/php/include/media.inc.php (+17/-10)
frontends/php/include/menu.inc.php (+2/-1)
frontends/php/include/nodes.inc.php (+0/-1)
frontends/php/include/page_header.php (+15/-6)
frontends/php/include/profiles.inc.php (+1/-1)
frontends/php/include/requirements.inc.php (+17/-0)
frontends/php/include/schema.inc.php (+4302/-651)
frontends/php/include/screens.inc.php (+11/-2)
frontends/php/include/scripts.inc.php (+0/-72)
frontends/php/include/services.inc.php (+3/-41)
frontends/php/include/setup.inc.php (+177/-423)
frontends/php/include/triggers.inc.php (+109/-249)
frontends/php/include/users.inc.php (+1/-1)
frontends/php/include/validate.inc.php (+1/-1)
frontends/php/include/xmlschemas/screens.rng (+135/-0)
frontends/php/index.php (+4/-2)
frontends/php/items.php (+12/-15)
frontends/php/js/class.cmap.js (+59/-75)
frontends/php/js/class.cmessages.js (+2/-2)
frontends/php/js/class.csuggest.js (+2/-2)
frontends/php/js/class.pmaster.js (+2/-2)
frontends/php/js/common.js (+61/-72)
frontends/php/js/functions.js (+45/-9)
frontends/php/js/ie6fix.js (+1/-1)
frontends/php/js/main.js (+91/-91)
frontends/php/js/prototype.js (+2/-3)
frontends/php/jsLoader.php (+118/-107)
frontends/php/jsrpc.php (+3/-3)
frontends/php/locales.php (+13/-61)
frontends/php/maps.php (+7/-10)
frontends/php/media_types.php (+115/-78)
frontends/php/popup.php (+22/-13)
frontends/php/popup_trexpr.php (+172/-105)
frontends/php/proxies.php (+3/-2)
frontends/php/queue.php (+3/-3)
frontends/php/report4.php (+40/-21)
frontends/php/report5.php (+1/-0)
frontends/php/screenconf.php (+21/-11)
frontends/php/screenedit.php (+10/-15)
frontends/php/screens.php (+70/-21)
frontends/php/scripts.php (+9/-9)
frontends/php/scripts_exec.php (+32/-33)
frontends/php/search.php (+17/-21)
frontends/php/services_form.php (+16/-4)
frontends/php/setup.php (+14/-8)
frontends/php/slides.php (+9/-3)
frontends/php/styles/css_od.css (+8/-0)
frontends/php/styles/table.css (+31/-33)
frontends/php/sysmap.php (+1/-2)
frontends/php/sysmaps.php (+16/-25)
frontends/php/templates.php (+26/-27)
frontends/php/tr_comments.php (+30/-6)
frontends/php/tr_events.php (+18/-8)
frontends/php/tr_logform.php (+27/-31)
frontends/php/tr_status.php (+45/-15)
frontends/php/triggers.php (+58/-34)
frontends/php/users.php (+8/-6)
include/common.h (+67/-73)
include/comms.h (+1/-0)
include/config.h.in (+47/-38)
include/daemon.h (+3/-3)
include/db.h (+94/-104)
include/dbcache.h (+6/-5)
include/dbschema.h (+16/-25)
include/email.h (+0/-28)
include/jabber.h (+0/-27)
include/mutexs.h (+3/-0)
include/sms.h (+0/-26)
include/sysinc.h (+3/-0)
include/sysinfo.h (+158/-127)
include/threads.h (+3/-1)
include/zbxdb.h (+128/-104)
include/zbxicmpping.h (+11/-9)
include/zbxmacros.h (+0/-1)
include/zbxmedia.h (+37/-0)
include/zbxodbc.h (+1/-1)
include/zbxserver.h (+5/-9)
m4/ax_lib_ibm_db2.m4 (+64/-0)
m4/ax_lib_oracle_oci.m4 (+2/-2)
m4/ax_lib_postgresql.m4 (+3/-1)
m4/ldap.m4 (+3/-1)
m4/libcurl.m4 (+6/-2)
man/Makefile.in (+2/-1)
man/zabbix_sender.man (+12/-8)
misc/Makefile.in (+2/-1)
misc/conf/zabbix_agent.conf (+0/-1)
misc/conf/zabbix_agentd.conf (+19/-21)
misc/conf/zabbix_agentd.win.conf (+42/-11)
misc/conf/zabbix_agentd/userparameter_examples.conf (+2/-0)
misc/conf/zabbix_agentd/userparameter_mysql.conf (+14/-0)
misc/conf/zabbix_proxy.conf (+20/-12)
misc/conf/zabbix_server.conf (+15/-3)
misc/init.d/debian/zabbix-agent (+3/-19)
misc/init.d/debian/zabbix-server (+2/-18)
misc/init.d/fedora/core/zabbix_agentd (+1/-1)
misc/init.d/fedora/core/zabbix_server (+1/-2)
misc/init.d/fedora/core5/zabbix_agentd (+2/-3)
misc/init.d/fedora/core5/zabbix_server (+2/-3)
misc/init.d/gentoo/zabbix-agentd (+4/-7)
misc/init.d/gentoo/zabbix-server (+4/-9)
misc/init.d/redhat/zabbix_agentd_ctl (+1/-1)
misc/init.d/redhat/zabbix_server_ctl (+1/-1)
misc/init.d/suse/9.1/zabbix_agentd (+1/-1)
misc/init.d/suse/9.1/zabbix_server (+1/-1)
misc/init.d/suse/9.2/zabbix_agentd (+1/-1)
misc/init.d/suse/9.2/zabbix_server (+1/-1)
misc/init.d/suse/9.3/zabbix_agentd (+1/-1)
misc/init.d/suse/9.3/zabbix_server (+1/-1)
misc/init.d/tru64/zabbix_agentd (+3/-3)
misc/init.d/tru64/zabbix_server (+3/-3)
misc/snmptrap/snmptrap.sh (+1/-2)
src/Makefile.in (+2/-1)
src/libs/Makefile.am (+3/-11)
src/libs/Makefile.in (+5/-9)
src/libs/zbxalgo/Makefile.in (+2/-1)
src/libs/zbxalgo/binaryheap.c (+6/-6)
src/libs/zbxalgo/hashmap.c (+4/-4)
src/libs/zbxalgo/vector.c (+1/-1)
src/libs/zbxcommon/Makefile.in (+2/-1)
src/libs/zbxcommon/comms.c (+22/-112)
src/libs/zbxcommon/file.c (+1/-2)
src/libs/zbxcommon/misc.c (+219/-64)
src/libs/zbxcommon/str.c (+352/-114)
src/libs/zbxcomms/Makefile.in (+2/-1)
src/libs/zbxcomms/comms.c (+46/-19)
src/libs/zbxcommshigh/Makefile.in (+2/-1)
src/libs/zbxconf/Makefile.in (+2/-1)
src/libs/zbxconf/cfg.c (+2/-2)
src/libs/zbxcrypto/Makefile.in (+2/-1)
src/libs/zbxdb/Makefile.in (+2/-1)
src/libs/zbxdb/db.c (+793/-528)
src/libs/zbxdbcache/Makefile.in (+2/-1)
src/libs/zbxdbcache/dbcache.c (+70/-51)
src/libs/zbxdbcache/dbconfig.c (+148/-132)
src/libs/zbxdbcache/nextchecks.c (+23/-9)
src/libs/zbxdbhigh/Makefile.in (+2/-1)
src/libs/zbxdbhigh/db.c (+139/-136)
src/libs/zbxdbhigh/dbschema.c (+1/-3699)
src/libs/zbxdbhigh/discovery.c (+1/-1)
src/libs/zbxdbhigh/host.c (+28/-22)
src/libs/zbxdbhigh/macro.c (+2/-0)
src/libs/zbxdbhigh/odbc.c (+10/-10)
src/libs/zbxdbhigh/proxy.c (+1/-1)
src/libs/zbxemail/Makefile.am (+0/-5)
src/libs/zbxemail/Makefile.in (+0/-468)
src/libs/zbxemail/email.c (+0/-278)
src/libs/zbxicmpping/Makefile.in (+2/-1)
src/libs/zbxicmpping/icmpping.c (+179/-120)
src/libs/zbxjabber/Makefile.am (+0/-5)
src/libs/zbxjabber/Makefile.in (+0/-468)
src/libs/zbxjabber/jabber.c (+0/-541)
src/libs/zbxjson/Makefile.in (+2/-1)
src/libs/zbxlog/Makefile.in (+2/-1)
src/libs/zbxlog/log.c (+1/-3)
src/libs/zbxmedia/Makefile.am (+13/-0)
src/libs/zbxmedia/Makefile.in (+481/-0)
src/libs/zbxmedia/email.c (+290/-0)
src/libs/zbxmedia/eztexting.c (+291/-0)
src/libs/zbxmedia/jabber.c (+542/-0)
src/libs/zbxmedia/sms.c (+269/-0)
src/libs/zbxmemory/Makefile.in (+2/-1)
src/libs/zbxmemory/memalloc.c (+18/-15)
src/libs/zbxmemory/strpool.c (+3/-3)
src/libs/zbxnix/Makefile.in (+2/-1)
src/libs/zbxnix/daemon.c (+16/-6)
src/libs/zbxnix/pid.c (+6/-2)
src/libs/zbxplugin/Makefile.in (+2/-1)
src/libs/zbxserver/Makefile.in (+2/-1)
src/libs/zbxserver/evalfunc.c (+476/-384)
src/libs/zbxserver/evalfunc.h (+7/-6)
src/libs/zbxserver/expression.c (+394/-252)
src/libs/zbxsms/Makefile.am (+0/-5)
src/libs/zbxsms/Makefile.in (+0/-468)
src/libs/zbxsms/sms.c (+0/-280)
src/libs/zbxsys/Makefile.in (+2/-1)
src/libs/zbxsys/mutexs.c (+3/-3)
src/libs/zbxsys/symbols.c (+0/-1)
src/libs/zbxsys/threads.c (+2/-2)
src/libs/zbxsysinfo/Makefile.in (+2/-1)
src/libs/zbxsysinfo/aix/Makefile.am (+0/-3)
src/libs/zbxsysinfo/aix/Makefile.in (+2/-52)
src/libs/zbxsysinfo/aix/aix.c (+5/-17)
src/libs/zbxsysinfo/aix/cpu.c (+11/-46)
src/libs/zbxsysinfo/aix/diskio.c (+0/-157)
src/libs/zbxsysinfo/aix/diskspace.c (+1/-12)
src/libs/zbxsysinfo/aix/inodes.c (+12/-51)
src/libs/zbxsysinfo/aix/kernel.c (+0/-78)
src/libs/zbxsysinfo/aix/memory.c (+4/-17)
src/libs/zbxsysinfo/aix/net.c (+4/-27)
src/libs/zbxsysinfo/aix/proc.c (+30/-35)
src/libs/zbxsysinfo/aix/sensors.c (+0/-116)
src/libs/zbxsysinfo/aix/swap.c (+0/-333)
src/libs/zbxsysinfo/aix/uptime.c (+1/-8)
src/libs/zbxsysinfo/aix/vmstats.c (+24/-30)
src/libs/zbxsysinfo/common/Makefile.in (+2/-1)
src/libs/zbxsysinfo/common/common.c (+38/-46)
src/libs/zbxsysinfo/common/common.h (+4/-2)
src/libs/zbxsysinfo/common/file.c (+2/-30)
src/libs/zbxsysinfo/common/file.h (+4/-3)
src/libs/zbxsysinfo/common/http.c (+101/-164)
src/libs/zbxsysinfo/common/http.h (+3/-2)
src/libs/zbxsysinfo/common/net.c (+34/-111)
src/libs/zbxsysinfo/common/net.h (+7/-7)
src/libs/zbxsysinfo/common/system.c (+2/-18)
src/libs/zbxsysinfo/common/system.h (+6/-5)
src/libs/zbxsysinfo/freebsd/Makefile.am (+2/-3)
src/libs/zbxsysinfo/freebsd/Makefile.in (+21/-37)
src/libs/zbxsysinfo/freebsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/freebsd/cpu.c (+6/-31)
src/libs/zbxsysinfo/freebsd/diskio.c (+28/-57)
src/libs/zbxsysinfo/freebsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/freebsd/freebsd.c (+5/-8)
src/libs/zbxsysinfo/freebsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/freebsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/freebsd/memory.c (+2/-14)
src/libs/zbxsysinfo/freebsd/net.c (+9/-34)
src/libs/zbxsysinfo/freebsd/proc.c (+70/-53)
src/libs/zbxsysinfo/freebsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/freebsd/swap.c (+5/-17)
src/libs/zbxsysinfo/freebsd/uptime.c (+3/-24)
src/libs/zbxsysinfo/hpux/Makefile.am (+1/-7)
src/libs/zbxsysinfo/hpux/Makefile.in (+4/-104)
src/libs/zbxsysinfo/hpux/cpu.c (+22/-77)
src/libs/zbxsysinfo/hpux/diskio.c (+0/-157)
src/libs/zbxsysinfo/hpux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/hpux/hpux.c (+4/-29)
src/libs/zbxsysinfo/hpux/inodes.c (+8/-52)
src/libs/zbxsysinfo/hpux/kernel.c (+0/-78)
src/libs/zbxsysinfo/hpux/memory.c (+10/-97)
src/libs/zbxsysinfo/hpux/net.c (+0/-67)
src/libs/zbxsysinfo/hpux/proc.c (+0/-500)
src/libs/zbxsysinfo/hpux/sensors.c (+0/-116)
src/libs/zbxsysinfo/hpux/swap.c (+0/-333)
src/libs/zbxsysinfo/hpux/uptime.c (+0/-120)
src/libs/zbxsysinfo/linux/Makefile.am (+2/-2)
src/libs/zbxsysinfo/linux/Makefile.in (+21/-20)
src/libs/zbxsysinfo/linux/boottime.c (+2/-7)
src/libs/zbxsysinfo/linux/cpu.c (+8/-29)
src/libs/zbxsysinfo/linux/diskio.c (+30/-57)
src/libs/zbxsysinfo/linux/diskspace.c (+1/-12)
src/libs/zbxsysinfo/linux/inodes.c (+15/-61)
src/libs/zbxsysinfo/linux/kernel.c (+0/-7)
src/libs/zbxsysinfo/linux/linux.c (+8/-6)
src/libs/zbxsysinfo/linux/memory.c (+23/-80)
src/libs/zbxsysinfo/linux/net.c (+123/-62)
src/libs/zbxsysinfo/linux/proc.c (+32/-37)
src/libs/zbxsysinfo/linux/sensors.c (+141/-96)
src/libs/zbxsysinfo/linux/swap.c (+34/-45)
src/libs/zbxsysinfo/linux/uptime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/Makefile.am (+2/-4)
src/libs/zbxsysinfo/netbsd/Makefile.in (+21/-54)
src/libs/zbxsysinfo/netbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/netbsd/cpu.c (+9/-37)
src/libs/zbxsysinfo/netbsd/diskio.c (+0/-157)
src/libs/zbxsysinfo/netbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/netbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/netbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/netbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/netbsd/net.c (+65/-261)
src/libs/zbxsysinfo/netbsd/netbsd.c (+5/-15)
src/libs/zbxsysinfo/netbsd/proc.c (+56/-38)
src/libs/zbxsysinfo/netbsd/sensors.c (+0/-116)
src/libs/zbxsysinfo/netbsd/swap.c (+0/-333)
src/libs/zbxsysinfo/netbsd/uptime.c (+1/-20)
src/libs/zbxsysinfo/openbsd/Makefile.am (+2/-2)
src/libs/zbxsysinfo/openbsd/Makefile.in (+21/-20)
src/libs/zbxsysinfo/openbsd/boottime.c (+0/-4)
src/libs/zbxsysinfo/openbsd/cpu.c (+5/-26)
src/libs/zbxsysinfo/openbsd/diskio.c (+9/-33)
src/libs/zbxsysinfo/openbsd/diskspace.c (+1/-12)
src/libs/zbxsysinfo/openbsd/inodes.c (+1/-15)
src/libs/zbxsysinfo/openbsd/kernel.c (+2/-11)
src/libs/zbxsysinfo/openbsd/memory.c (+2/-14)
src/libs/zbxsysinfo/openbsd/net.c (+146/-294)
src/libs/zbxsysinfo/openbsd/openbsd.c (+7/-8)
src/libs/zbxsysinfo/openbsd/proc.c (+65/-43)
src/libs/zbxsysinfo/openbsd/sensors.c (+175/-87)
src/libs/zbxsysinfo/openbsd/swap.c (+16/-30)
src/libs/zbxsysinfo/openbsd/uptime.c (+0/-5)
src/libs/zbxsysinfo/osf/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osf/Makefile.in (+3/-35)
src/libs/zbxsysinfo/osf/cpu.c (+20/-78)
src/libs/zbxsysinfo/osf/diskio.c (+0/-157)
src/libs/zbxsysinfo/osf/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osf/inodes.c (+7/-53)
src/libs/zbxsysinfo/osf/kernel.c (+3/-17)
src/libs/zbxsysinfo/osf/memory.c (+6/-70)
src/libs/zbxsysinfo/osf/net.c (+0/-67)
src/libs/zbxsysinfo/osf/osf.c (+5/-21)
src/libs/zbxsysinfo/osf/proc.c (+61/-72)
src/libs/zbxsysinfo/osf/sensors.c (+0/-116)
src/libs/zbxsysinfo/osf/swap.c (+22/-92)
src/libs/zbxsysinfo/osf/uptime.c (+2/-26)
src/libs/zbxsysinfo/osx/Makefile.am (+0/-2)
src/libs/zbxsysinfo/osx/Makefile.in (+3/-35)
src/libs/zbxsysinfo/osx/cpu.c (+26/-131)
src/libs/zbxsysinfo/osx/diskio.c (+0/-157)
src/libs/zbxsysinfo/osx/diskspace.c (+1/-12)
src/libs/zbxsysinfo/osx/inodes.c (+9/-50)
src/libs/zbxsysinfo/osx/kernel.c (+4/-19)
src/libs/zbxsysinfo/osx/memory.c (+10/-91)
src/libs/zbxsysinfo/osx/net.c (+0/-67)
src/libs/zbxsysinfo/osx/osx.c (+5/-21)
src/libs/zbxsysinfo/osx/proc.c (+18/-28)
src/libs/zbxsysinfo/osx/sensors.c (+0/-116)
src/libs/zbxsysinfo/osx/swap.c (+22/-90)
src/libs/zbxsysinfo/osx/uptime.c (+1/-23)
src/libs/zbxsysinfo/simple/Makefile.in (+2/-1)
src/libs/zbxsysinfo/simple/ntp.h (+3/-2)
src/libs/zbxsysinfo/simple/simple.c (+8/-8)
src/libs/zbxsysinfo/simple/simple.h (+3/-2)
src/libs/zbxsysinfo/solaris/Makefile.am (+1/-2)
src/libs/zbxsysinfo/solaris/Makefile.in (+19/-35)
src/libs/zbxsysinfo/solaris/boottime.c (+0/-5)
src/libs/zbxsysinfo/solaris/cpu.c (+58/-84)
src/libs/zbxsysinfo/solaris/diskio.c (+69/-109)
src/libs/zbxsysinfo/solaris/diskspace.c (+1/-12)
src/libs/zbxsysinfo/solaris/inodes.c (+6/-47)
src/libs/zbxsysinfo/solaris/kernel.c (+4/-19)
src/libs/zbxsysinfo/solaris/memory.c (+16/-42)
src/libs/zbxsysinfo/solaris/net.c (+28/-129)
src/libs/zbxsysinfo/solaris/proc.c (+29/-33)
src/libs/zbxsysinfo/solaris/sensors.c (+0/-116)
src/libs/zbxsysinfo/solaris/solaris.c (+5/-7)
src/libs/zbxsysinfo/solaris/swap.c (+26/-72)
src/libs/zbxsysinfo/solaris/uptime.c (+0/-5)
src/libs/zbxsysinfo/specsysinfo.h (+6/-5)
src/libs/zbxsysinfo/sysinfo.c (+50/-67)
src/libs/zbxsysinfo/unknown/Makefile.am (+1/-12)
src/libs/zbxsysinfo/unknown/Makefile.in (+4/-174)
src/libs/zbxsysinfo/unknown/cpu.c (+0/-465)
src/libs/zbxsysinfo/unknown/diskio.c (+0/-157)
src/libs/zbxsysinfo/unknown/diskspace.c (+0/-171)
src/libs/zbxsysinfo/unknown/inodes.c (+0/-237)
src/libs/zbxsysinfo/unknown/kernel.c (+0/-78)
src/libs/zbxsysinfo/unknown/memory.c (+0/-408)
src/libs/zbxsysinfo/unknown/net.c (+0/-67)
src/libs/zbxsysinfo/unknown/proc.c (+0/-500)
src/libs/zbxsysinfo/unknown/sensors.c (+0/-116)
src/libs/zbxsysinfo/unknown/swap.c (+0/-333)
src/libs/zbxsysinfo/unknown/unknown.c (+4/-38)
src/libs/zbxsysinfo/unknown/uptime.c (+0/-120)
src/libs/zbxsysinfo/win32/cpu.c (+3/-34)
src/libs/zbxsysinfo/win32/diskio.c (+0/-24)
src/libs/zbxsysinfo/win32/diskspace.c (+5/-5)
src/libs/zbxsysinfo/win32/inodes.c (+0/-33)
src/libs/zbxsysinfo/win32/kernel.c (+0/-40)
src/libs/zbxsysinfo/win32/memory.c (+0/-2)
src/libs/zbxsysinfo/win32/net.c (+5/-32)
src/libs/zbxsysinfo/win32/pdhmon.c (+4/-4)
src/libs/zbxsysinfo/win32/proc.c (+20/-30)
src/libs/zbxsysinfo/win32/sensors.c (+0/-34)
src/libs/zbxsysinfo/win32/swap.c (+0/-22)
src/libs/zbxsysinfo/win32/win32.c (+4/-18)
src/libs/zbxwin32/service.c (+0/-1)
src/zabbix_agent/Makefile.am (+1/-1)
src/zabbix_agent/Makefile.in (+3/-2)
src/zabbix_agent/active.c (+1/-1)
src/zabbix_agent/cpustat.c (+109/-110)
src/zabbix_agent/cpustat.h (+23/-12)
src/zabbix_agent/diskdevices.c (+20/-8)
src/zabbix_agent/eventlog.c (+14/-12)
src/zabbix_agent/eventlog.h (+4/-4)
src/zabbix_agent/interfaces.c (+0/-1)
src/zabbix_agent/interfaces.h (+0/-1)
src/zabbix_agent/listener.c (+1/-1)
src/zabbix_agent/logfiles.c (+2/-2)
src/zabbix_agent/stats.c (+11/-16)
src/zabbix_agent/stats.h (+3/-3)
src/zabbix_agent/zabbix_agent.c (+9/-8)
src/zabbix_agent/zabbix_agent.h (+0/-23)
src/zabbix_agent/zabbix_agentd.c (+16/-12)
src/zabbix_agent/zbxconf.c (+27/-13)
src/zabbix_agent/zbxconf.h (+4/-2)
src/zabbix_get/Makefile.am (+2/-2)
src/zabbix_get/Makefile.in (+6/-5)
src/zabbix_get/zabbix_get.c (+15/-14)
src/zabbix_proxy/Makefile.in (+2/-1)
src/zabbix_proxy/datasender/Makefile.in (+2/-1)
src/zabbix_proxy/events.c (+1/-1)
src/zabbix_proxy/events.h (+1/-2)
src/zabbix_proxy/heart/Makefile.in (+2/-1)
src/zabbix_proxy/heart/heart.c (+9/-11)
src/zabbix_proxy/housekeeper/Makefile.in (+2/-1)
src/zabbix_proxy/housekeeper/housekeeper.c (+28/-12)
src/zabbix_proxy/proxy.c (+91/-65)
src/zabbix_proxy/proxyconfig/Makefile.in (+2/-1)
src/zabbix_sender/Makefile.am (+2/-2)
src/zabbix_sender/Makefile.in (+6/-5)
src/zabbix_sender/zabbix_sender.c (+89/-45)
src/zabbix_server/Makefile.am (+1/-7)
src/zabbix_server/Makefile.in (+5/-8)
src/zabbix_server/actions.c (+107/-104)
src/zabbix_server/actions.h (+0/-1)
src/zabbix_server/alerter/Makefile.in (+2/-1)
src/zabbix_server/alerter/alerter.c (+7/-5)
src/zabbix_server/dbconfig/Makefile.in (+2/-1)
src/zabbix_server/dbsyncer/Makefile.in (+2/-1)
src/zabbix_server/discoverer/Makefile.in (+2/-1)
src/zabbix_server/discoverer/discoverer.c (+63/-26)
src/zabbix_server/escalator/Makefile.in (+2/-1)
src/zabbix_server/escalator/escalator.c (+28/-86)
src/zabbix_server/events.c (+3/-3)
src/zabbix_server/events.h (+1/-2)
src/zabbix_server/housekeeper/Makefile.in (+2/-1)
src/zabbix_server/httppoller/Makefile.in (+2/-1)
src/zabbix_server/httppoller/httpmacro.c (+1/-4)
src/zabbix_server/httppoller/httpmacro.h (+1/-1)
src/zabbix_server/httppoller/httppoller.c (+11/-31)
src/zabbix_server/httppoller/httptest.c (+286/-362)
src/zabbix_server/httppoller/httptest.h (+23/-27)
src/zabbix_server/nodewatcher/Makefile.in (+2/-1)
src/zabbix_server/nodewatcher/history.c (+3/-2)
src/zabbix_server/nodewatcher/nodecomms.c (+0/-21)
src/zabbix_server/nodewatcher/nodecomms.h (+0/-1)
src/zabbix_server/nodewatcher/nodesender.c (+72/-41)
src/zabbix_server/nodewatcher/nodewatcher.c (+93/-13)
src/zabbix_server/nodewatcher/nodewatcher.h (+4/-1)
src/zabbix_server/operations.c (+27/-38)
src/zabbix_server/operations.h (+4/-7)
src/zabbix_server/pinger/Makefile.in (+2/-1)
src/zabbix_server/pinger/pinger.c (+109/-85)
src/zabbix_server/pinger/pinger.h (+1/-1)
src/zabbix_server/poller/Makefile.in (+2/-1)
src/zabbix_server/poller/checks_calculated.c (+27/-19)
src/zabbix_server/poller/checks_internal.c (+22/-22)
src/zabbix_server/poller/checks_ipmi.c (+46/-103)
src/zabbix_server/poller/checks_snmp.c (+8/-7)
src/zabbix_server/poller/checks_ssh.c (+32/-32)
src/zabbix_server/poller/checks_telnet.c (+5/-5)
src/zabbix_server/poller/poller.c (+174/-119)
src/zabbix_server/poller/poller.h (+1/-0)
src/zabbix_server/proxypoller/Makefile.in (+2/-1)
src/zabbix_server/proxypoller/proxypoller.c (+34/-10)
src/zabbix_server/server.c (+177/-124)
src/zabbix_server/timer/Makefile.in (+2/-1)
src/zabbix_server/timer/timer.c (+131/-55)
src/zabbix_server/trapper/Makefile.in (+2/-1)
src/zabbix_server/trapper/active.c (+0/-1)
src/zabbix_server/trapper/nodecommand.c (+1/-1)
src/zabbix_server/trapper/nodehistory.c (+67/-27)
src/zabbix_server/trapper/nodesync.c (+26/-0)
src/zabbix_server/trapper/trapper.c (+12/-11)
src/zabbix_server/utils/Makefile.in (+2/-1)
src/zabbix_server/watchdog/Makefile.in (+2/-1)
src/zabbix_server/watchdog/watchdog.c (+57/-40)
src/zabbix_server/watchdog/watchdog.h (+1/-1)
upgrades/Makefile.in (+2/-1)