zabbix-1.2_dev integration

git-svn-id: svn://svn.zabbix.com/trunk@3038 97f52cf1-0a1b-0410-bd0e-c28be96e8082

11 files changed, 98 insertions, 287 deletions

diff --git a/src/libs/zbxsysinfo/openbsd/Makefile.am b/src/libs/zbxsysinfo/openbsd/Makefile.am
index 94393287..1905eecf 100644
--- a/src/libs/zbxsysinfo/openbsd/Makefile.am
+++ b/src/libs/zbxsysinfo/openbsd/Makefile.am
@@ -3,4 +3,4 @@ SUBDIRS=
 libzbxsysinfo2_a_SOURCES=cpu.c diskio.c diskspace.c inodes.c kernel.c memory.c net.c proc.c sensors.c swap.c uptime.c
 
 lib_LIBRARIES=libzbxsysinfo2.a
-libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
+#libzbxsysinfo2_a_LIBADD = ../../zbxcommon/libzbxcommon.a ../../zbxcrypto/libzbxcrypto.a
diff --git a/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c b/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
index fb3ea30d..9d6c69ca 100755
--- a/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
+++ b/src/libs/zbxsysinfo/openbsd/OpenBSD3.7.c
@@ -1819,7 +1819,7 @@ ZBX_METRIC agent_commands[]=
         {"system[hostname]"     ,0,             EXECUTE_STR, "hostname"},
         {"system[uname]"        ,0,             EXECUTE_STR, "uname -a"},
         {"system[uptime]"       ,UPTIME,        0, 0},
-        {"system[users]"        ,EXECUTE,       0,"who|wc -l"},
+        {"system[users]"        ,EXECUTE_INT,       0,"who|wc -l"},
 
         {"ping"                 ,PING,          0, 0},
         {"tcp_count"            ,TCP_SOCKETS,   0, 0},
diff --git a/src/libs/zbxsysinfo/openbsd/cpu.c b/src/libs/zbxsysinfo/openbsd/cpu.c
index 998d998c..c9d3e4b7 100644
--- a/src/libs/zbxsysinfo/openbsd/cpu.c
+++ b/src/libs/zbxsysinfo/openbsd/cpu.c
@@ -96,21 +96,21 @@ CPU_PARAMLIST
         return SYSINFO_RET_FAIL;
     }
 
-    if(get_param(param, 1, cpuname, MAX_STRING_LEN) != 0)
+    if(get_param(param, 1, cpuname, sizeof(cpuname)) != 0)
     {
         cpuname[0] = '\0';
     }
     if(cpuname[0] == '\0')
     {
         /* default parameter */
-        sprintf(cpuname, "all");
+        zbx_snprintf(cpuname, sizeof(cpuname) "all");
     }
-    if(strncmp(cpuname, "all", MAX_STRING_LEN))
+    if(strncmp(cpuname, "all", sizeof(cpuname)))
     {
         return SYSINFO_RET_FAIL;
     }
 
-    if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+    if(get_param(param, 2, mode, sizeof(mode)) != 0)
     {
         mode[0] = '\0';
     }
@@ -240,28 +240,28 @@ CPU_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, cpuname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, cpuname, sizeof(cpuname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	if(cpuname[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(cpuname, "all");
+		zbx_snprintf(cpuname, sizeof(cpuname), "all");
 	}
-	if(strncmp(cpuname, "all", MAX_STRING_LEN))
+	if(strncmp(cpuname, "all", sizeof(cpuname)))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "avg1");
+		zbx_snprintf(mode, sizeof(mode), "avg1");
 	}
 	for(i=0; fl[i].mode!=0; i++)
 	{
diff --git a/src/libs/zbxsysinfo/openbsd/diskio.c b/src/libs/zbxsysinfo/openbsd/diskio.c
index 41bc7bbc..ffa5b722 100644
--- a/src/libs/zbxsysinfo/openbsd/diskio.c
+++ b/src/libs/zbxsysinfo/openbsd/diskio.c
@@ -212,12 +212,12 @@ DEV_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, devname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, devname, sizeof(devname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -225,7 +225,7 @@ DEV_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, fl[0].mode);
+		zbx_snprintf(mode, sizeof(mode), fl[0].mode);
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
@@ -269,12 +269,12 @@ DEV_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, devname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, devname, sizeof(devname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -282,7 +282,7 @@ DEV_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, fl[0].mode);
+		zbx_snprintf(mode, sizeof(mode), fl[0].mode);
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/openbsd/diskspace.c b/src/libs/zbxsysinfo/openbsd/diskspace.c
index fd89f469..f37aeb7c 100644
--- a/src/libs/zbxsysinfo/openbsd/diskspace.c
+++ b/src/libs/zbxsysinfo/openbsd/diskspace.c
@@ -212,19 +212,19 @@ FS_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, fsname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, fsname, sizeof(fsname)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "total");
+		zbx_snprintf(mode, sizeof(mode), "total");
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/openbsd/inodes.c b/src/libs/zbxsysinfo/openbsd/inodes.c
index a27e8644..fbc50fc1 100644
--- a/src/libs/zbxsysinfo/openbsd/inodes.c
+++ b/src/libs/zbxsysinfo/openbsd/inodes.c
@@ -197,19 +197,19 @@ FS_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, fsname, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, fsname, sizeof(mode)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "total");
+		zbx_snprintf(mode, sizeof(mode), "total");
 	}
 	
 	for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/openbsd/memory.c b/src/libs/zbxsysinfo/openbsd/memory.c
index 4c70e997..d710b029 100644
--- a/src/libs/zbxsysinfo/openbsd/memory.c
+++ b/src/libs/zbxsysinfo/openbsd/memory.c
@@ -97,7 +97,7 @@ MEM_FNCLIST
         }
 	else
 	{
-		if(get_param(param, 1, mode, MAX_STRING_LEN) != 0)
+		if(get_param(param, 1, mode, sizeof(mode)) != 0)
 		{
 			mode[0] = '\0';
 		}
@@ -105,7 +105,7 @@ MEM_FNCLIST
 		if(mode[0] == '\0')
 		{
 			/* default parameter */
-			sprintf(mode, "total");
+			zbx_snprintf(mode, sizeof(mode) "total");
 		}
 
 		for(i=0; fl[i].mode!=0; i++)
diff --git a/src/libs/zbxsysinfo/openbsd/net.c b/src/libs/zbxsysinfo/openbsd/net.c
index 467cf1bb..200c3935 100644
--- a/src/libs/zbxsysinfo/openbsd/net.c
+++ b/src/libs/zbxsysinfo/openbsd/net.c
@@ -88,7 +88,7 @@ static int get_ifdata(const char *device, struct ifnet *result)
 static int      NET_IF_IN_BYTES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -100,12 +100,12 @@ static int      NET_IF_IN_BYTES(const char *cmd, const char *param, unsigned fla
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -119,7 +119,7 @@ static int      NET_IF_IN_BYTES(const char *cmd, const char *param, unsigned fla
 static int      NET_IF_IN_PACKETS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -131,12 +131,12 @@ static int      NET_IF_IN_PACKETS(const char *cmd, const char *param, unsigned f
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -150,7 +150,7 @@ static int      NET_IF_IN_PACKETS(const char *cmd, const char *param, unsigned f
 static int      NET_IF_IN_ERRORS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -162,12 +162,12 @@ static int      NET_IF_IN_ERRORS(const char *cmd, const char *param, unsigned fl
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -195,7 +195,7 @@ NET_FNCLIST
                 {0,         0}
         };
 
-        char interface[MAX_STRING_LEN];
+        char if_name[MAX_STRING_LEN];
         char mode[MAX_STRING_LEN];
         int i;
 
@@ -208,26 +208,26 @@ NET_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, if_name, sizeof(if_name)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+        if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
         {
                 /* default parameter */
-                sprintf(mode, "bytes");
+                zbx_snprintf(mode, sizeof(mode), "bytes");
         }
 
         for(i=0; fl[i].mode!=0; i++)
         {
                 if(strncmp(mode, fl[i].mode, MAX_STRING_LEN)==0)
                 {
-                        return (fl[i].function)(cmd, interface, flags, result);
+                        return (fl[i].function)(cmd, if_name, flags, result);
                 }
         }
 
@@ -237,7 +237,7 @@ NET_FNCLIST
 static int      NET_IF_OUT_BYTES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -249,12 +249,12 @@ static int      NET_IF_OUT_BYTES(const char *cmd, const char *param, unsigned fl
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -268,7 +268,7 @@ static int      NET_IF_OUT_BYTES(const char *cmd, const char *param, unsigned fl
 static int      NET_IF_OUT_PACKETS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -280,12 +280,12 @@ static int      NET_IF_OUT_PACKETS(const char *cmd, const char *param, unsigned
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -299,7 +299,7 @@ static int      NET_IF_OUT_PACKETS(const char *cmd, const char *param, unsigned
 static int      NET_IF_OUT_ERRORS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -311,12 +311,12 @@ static int      NET_IF_OUT_ERRORS(const char *cmd, const char *param, unsigned f
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -344,7 +344,7 @@ NET_FNCLIST
                 {0,         0}
         };
 
-        char interface[MAX_STRING_LEN];
+        char if_name[MAX_STRING_LEN];
         char mode[MAX_STRING_LEN];
         int i;
 
@@ -357,26 +357,26 @@ NET_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, if_name, sizeof(if_name)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+        if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
         {
                 /* default parameter */
-                sprintf(mode, "bytes");
+                zbx_snprintf(mode, sizeof(mode), "bytes");
         }
 
         for(i=0; fl[i].mode!=0; i++)
         {
                 if(strncmp(mode, fl[i].mode, MAX_STRING_LEN)==0)
                 {
-                        return (fl[i].function)(cmd, interface, flags, result);
+                        return (fl[i].function)(cmd, if_name, flags, result);
                 }
         }
 
@@ -386,7 +386,7 @@ NET_FNCLIST
 static int      NET_IF_TOTAL_BYTES(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -398,12 +398,12 @@ static int      NET_IF_TOTAL_BYTES(const char *cmd, const char *param, unsigned
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -417,7 +417,7 @@ static int      NET_IF_TOTAL_BYTES(const char *cmd, const char *param, unsigned
 static int      NET_IF_TOTAL_PACKETS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -429,12 +429,12 @@ static int      NET_IF_TOTAL_PACKETS(const char *cmd, const char *param, unsigne
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -448,7 +448,7 @@ static int      NET_IF_TOTAL_PACKETS(const char *cmd, const char *param, unsigne
 static int      NET_IF_TOTAL_ERRORS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -460,12 +460,12 @@ static int      NET_IF_TOTAL_ERRORS(const char *cmd, const char *param, unsigned
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
@@ -493,7 +493,7 @@ NET_FNCLIST
                 {0,         0}
         };
 
-        char interface[MAX_STRING_LEN];
+        char if_name[MAX_STRING_LEN];
         char mode[MAX_STRING_LEN];
         int i;
 
@@ -506,26 +506,26 @@ NET_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, if_name, sizeof(if_name)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+        if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
         if(mode[0] == '\0')
         {
                 /* default parameter */
-                sprintf(mode, "bytes");
+                zbx_snprintf(mode, sizeof(mode), "bytes");
         }
 
         for(i=0; fl[i].mode!=0; i++)
         {
                 if(strncmp(mode, fl[i].mode, MAX_STRING_LEN)==0)
                 {
-                        return (fl[i].function)(cmd, interface, flags, result);
+                        return (fl[i].function)(cmd, if_name, flags, result);
                 }
         }
 
@@ -544,7 +544,7 @@ int     NET_TCP_LISTEN(const char *cmd, const char *param, unsigned flags, AGENT
 int     NET_IF_COLLISIONS(const char *cmd, const char *param, unsigned flags, AGENT_RESULT *result)
 {
 	struct ifnet value;
-	char    interface[MAX_STRING_LEN];
+	char    if_name[MAX_STRING_LEN];
 	int     ret = SYSINFO_RET_FAIL;
 
 	assert(result);
@@ -556,12 +556,12 @@ int     NET_IF_COLLISIONS(const char *cmd, const char *param, unsigned flags, AG
 		return SYSINFO_RET_FAIL;
 	}
 
-	if(get_param(param, 1, interface, MAX_STRING_LEN) != 0)
+	if(get_param(param, 1, if_name, MAX_STRING_LEN) != 0)
 	{
 		return SYSINFO_RET_FAIL;
 	}
 
-	ret = get_ifdata(interface, &value);
+	ret = get_ifdata(if_name, &value);
 	
 	if(ret == SYSINFO_RET_OK)
 	{
diff --git a/src/libs/zbxsysinfo/openbsd/openbsd.c b/src/libs/zbxsysinfo/openbsd/openbsd.c
index 3d57642c..35104abf 100644
--- a/src/libs/zbxsysinfo/openbsd/openbsd.c
+++ b/src/libs/zbxsysinfo/openbsd/openbsd.c
@@ -25,212 +25,29 @@ ZBX_METRIC	parameters_specific[]=
 /* 	KEY			FLAG	FUNCTION 	ADD_PARAM	TEST_PARAM */
 	{
 
-/* Outdated */
-/* incorrect OLD naming */
-	{"cpu",			CF_USEUPARAM,	OLD_CPU, 	0,	"idle1"},
-/*
-	{"cpu[idle1]",		0,	0, 	0,	0},
-	{"cpu[idle5]",		0,	0, 	0,	0},
-	{"cpu[idle15]",		0,	0, 	0,	0},
-	{"cpu[nice1]",		0,	0, 	0,	0},
-	{"cpu[nice5]",		0,	0, 	0,	0},
-	{"cpu[nice15]",		0,	0, 	0,	0},
-	{"cpu[system1]",	0,	0, 	0,	0},
-	{"cpu[system5]",	0,	0, 	0,	0},
-	{"cpu[system15]",	0,	0, 	0,	0},
-	{"cpu[user1]",		0,	0, 	0,	0},
-	{"cpu[user5]",		0,	0, 	0,	0},
-	{"cpu[user15]",		0,	0, 	0,	0},
-*/
-	{"io",			CF_USEUPARAM,	OLD_IO,  	0,	"disk_io"},
-/*
-	{"io[disk_io]",		0,	0,  	0,	0},
-	{"io[disk_rio]",	0,	0, 	0,	0},
-	{"io[disk_wio]",	0,	0, 	0,	0},
-	{"io[disk_rblk]",	0,	0, 	0,	0},
-	{"io[disk_wblk]",	0,	0, 	0,	0},
-*/
-	{"kern",		CF_USEUPARAM,	OLD_KERNEL,	0,	"maxfiles"},
-/*
-	{"kern[maxfiles]",	0,	0,	0,	0},
-	{"kern[maxproc]",	0,	0,	0,	0},
-*/
-	{"memory",		CF_USEUPARAM,	OLD_MEMORY,	0,	"total"},
-/*
-	{"memory[buffers]",	0,	0,	0,	0},
-	{"memory[cached]",	0,	0, 	0,	0},
-	{"memory[free]",	0,	0, 	0,	0},
-	{"memory[shared]",	0,	0, 	0,	0},
-	{"memory[total]",	0,	0,	0,	0},
-*/
-	{"system",		CF_USEUPARAM,	OLD_SYSTEM, 	0,	"uname"},
-/*
-	{"system[proccount]",	0,	0, 	0,	0},
-
-	{"system[procload]",	0,	0, 	0,	0},
-	{"system[procload5]",	0,	0, 	0,	0},
-	{"system[procload15]",	0,	0, 	0,	0},
-	{"system[hostname]",	0,	0, 	0,	0},
-	{"system[uname]",	0,	0, 	0,	0},
-	{"system[uptime]",	0,	0,	0,	0},
-	{"system[users]",	0,	0, 	0,	0},
-
-	{"system[procrunning]",	0,	0, 	0,	0},
-*/
-	{"sensor",		CF_USEUPARAM,	OLD_SENSOR, 	0,	"temp1"},
-/*
-	{"sensor[temp1]",	0,	0, 	0,	0},
-	{"sensor[temp2]",	0,	0, 	0,	0},
-	{"sensor[temp3]",	0,	0, 	0,	0},
-*/	
-	{"swap",		CF_USEUPARAM,	OLD_SWAP,	0,	"total"},
-/*
-	{"swap[free]",		0,	0,	0,	0},
-	{"swap[total]",		0,	0,	0,	0},
-*/
-	{"version",		CF_USEUPARAM,	OLD_VERSION,	0,	"zabbix_agent"},
-/*
-	{"version[zabbix_agent]",	0,	OLD_VERSION, 		0,	0},
-*/
-/* correct OLD naming */	
-/*
-	{"cksum",		CF_USEUPARAM,	VFS_FILE_CKSUM, 	0,	"/etc/services"},
-*/
-/*
- 	{"diskfree",		CF_USEUPARAM,	VFS_FS_FREE,		0,	"/"},
-	{"disktotal",		CF_USEUPARAM,	VFS_FS_TOTAL,		0,	"/"},
-	{"diskused",		CF_USEUPARAM,	VFS_FS_USED,		0,	"/"},
-	{"diskfree_perc",	CF_USEUPARAM,	VFS_FS_PFREE,		0,	"/"},
-	{"diskused_perc",	CF_USEUPARAM,	VFS_FS_PUSED,		0,	"/"},
-*/
-/*
-	{"file",		CF_USEUPARAM,	VFS_FILE_EXISTS,	0,	"/etc/passwd"},
-	{"filesize",		CF_USEUPARAM,	VFS_FILE_SIZE, 		0,	"/etc/passwd"},
-*/
-/*
-	{"inodefree",		CF_USEUPARAM,	VFS_FS_INODE_FREE,	0,	"/"},
-	{"inodetotal",		CF_USEUPARAM,	VFS_FS_INODE_TOTAL,	0,	"/"},
-	{"inodefree_perc",	CF_USEUPARAM,	VFS_FS_INODE_PFREE,	0,	"/"},
-*/
-/*
-	{"md5sum",		CF_USEUPARAM,	VFS_FILE_MD5SUM,	0,	"/etc/services"},
-*/
-/*
-	{"netloadin1",		CF_USEUPARAM,	NET_IF_IBYTES1,		0,	"lo"},
-	{"netloadin5",		CF_USEUPARAM,	NET_IF_IBYTES5,		0,	"lo"},
-	{"netloadin15",		CF_USEUPARAM,	NET_IF_IBYTES15,	0,	"lo"},
-	{"netloadout1",		CF_USEUPARAM,	NET_IF_OBYTES1,		0,	"lo"},
-	{"netloadout5",		CF_USEUPARAM,	NET_IF_OBYTES5, 	0,	"lo"},
-	{"netloadout15",	CF_USEUPARAM,	NET_IF_OBYTES15,	0,	"lo"},
-*/
-/*
-	{"ping",		0,		AGENT_PING, 		0,	0},
-*/	
-/* New naming  */
-/*
-	{"system.cpu.idle1",	0,	SYSTEM_CPU_IDLE1, 	0,	0},
-	{"system.cpu.idle5",	0,	SYSTEM_CPU_IDLE5, 	0,	0},
-	{"system.cpu.idle15",	0,	SYSTEM_CPU_IDLE15, 	0,	0},
-	{"system.cpu.nice1",	0,	SYSTEM_CPU_NICE1, 	0,	0},
-	{"system.cpu.nice5",	0,	SYSTEM_CPU_NICE5, 	0,	0},
-	{"system.cpu.nice15",	0,	SYSTEM_CPU_NICE15, 	0,	0},
-	{"system.cpu.sys1",	0,	SYSTEM_CPU_SYS1, 	0,	0},
-	{"system.cpu.sys5",	0,	SYSTEM_CPU_SYS5, 	0,	0},
-	{"system.cpu.sys15",	0,	SYSTEM_CPU_SYS15, 	0,	0},
-	{"system.cpu.user1",	0,	SYSTEM_CPU_USER1, 	0,	0},
-	{"system.cpu.user5",	0,	SYSTEM_CPU_USER5, 	0,	0},
-	{"system.cpu.user15",	0,	SYSTEM_CPU_USER15, 	0,	0},
-*/
-/*
-	{"vm.memory.total",	0,	VM_MEMORY_TOTAL,	0,	0},
-	{"vm.memory.shared",	0,	VM_MEMORY_SHARED,	0,	0},
-	{"vm.memory.buffers",	0,	VM_MEMORY_BUFFERS,	0,	0},
-	{"vm.memory.cached",	0,	VM_MEMORY_CACHED, 	0,	0},
-	{"vm.memory.free",	0,	VM_MEMORY_FREE, 	0,	0},
-*/
-/*
-	{"vfs.fs.free",		CF_USEUPARAM,	VFS_FS_FREE,		0,	"/"},
-	{"vfs.fs.total",	CF_USEUPARAM,	VFS_FS_TOTAL,		0,	"/"},
-	{"vfs.fs.used",		CF_USEUPARAM,	VFS_FS_USED,		0,	"/"},
-	{"vfs.fs.pfree",	CF_USEUPARAM,	VFS_FS_PFREE,		0,	"/"},
-	{"vfs.fs.pused",	CF_USEUPARAM,	VFS_FS_PUSED,		0,	"/"},
-*/
-/*
-	{"vfs.fs.inode.free",	CF_USEUPARAM,	VFS_FS_INODE_FREE,	0,	"/"},
-	{"vfs.fs.inode.total",	CF_USEUPARAM,	VFS_FS_INODE_TOTAL,	0,	"/"},
-	{"vfs.fs.inode.pfree",	CF_USEUPARAM,	VFS_FS_INODE_PFREE,	0,	"/"},
-*/
-/*
-	{"net.if.ibytes1",	CF_USEUPARAM,	NET_IF_IBYTES1,	0,	"lo"},
-	{"net.if.ibytes5",	CF_USEUPARAM,	NET_IF_IBYTES5,	0,	"lo"},
-	{"net.if.ibytes15",	CF_USEUPARAM,	NET_IF_IBYTES15,0,	"lo"},
-
-	{"net.if.obytes1",	CF_USEUPARAM,	NET_IF_OBYTES1,	0,	"lo"},
-	{"net.if.obytes5",	CF_USEUPARAM,	NET_IF_OBYTES5,	0,	"lo"},
-	{"net.if.obytes15",	CF_USEUPARAM,	NET_IF_OBYTES15,0,	"lo"},
-*/
-/*
-	{"disk_read_ops1",	CF_USEUPARAM,	DISKREADOPS1, 	0,	"hda"},
-	{"disk_read_ops5",	CF_USEUPARAM,	DISKREADOPS5, 	0,	"hda"},
-	{"disk_read_ops15",	CF_USEUPARAM,	DISKREADOPS15,	0,	"hda"},
-
-	{"disk_read_blks1",	CF_USEUPARAM,	DISKREADBLKS1,	0,	"hda"},
-	{"disk_read_blks5",	CF_USEUPARAM,	DISKREADBLKS5,	0,	"hda"},
-	{"disk_read_blks15",	CF_USEUPARAM,	DISKREADBLKS15,	0,	"hda"},
-
-	{"disk_write_ops1",	CF_USEUPARAM,	DISKWRITEOPS1, 	0,	"hda"},
-	{"disk_write_ops5",	CF_USEUPARAM,	DISKWRITEOPS5, 	0,	"hda"},
-	{"disk_write_ops15",	CF_USEUPARAM,	DISKWRITEOPS15,	0,	"hda"},
-
-	{"disk_write_blks1",	CF_USEUPARAM,	DISKWRITEBLKS1,	0,	"hda"},
-	{"disk_write_blks5",	CF_USEUPARAM,	DISKWRITEBLKS5,	0,	"hda"},
-	{"disk_write_blks15",	CF_USEUPARAM,	DISKWRITEBLKS15,0,	"hda"},
-*/
-/*
-	{"system.cpu.load1",	0,	SYSTEM_CPU_LOAD1,	0,	0},
-	{"system.cpu.load5",	0,	SYSTEM_CPU_LOAD5,	0,	0},
-	{"system.cpu.load15",	0,	SYSTEM_CPU_LOAD15,	0,	0},
-*/
-
-/****************************************
-  	All these perameters require more than 1 second to retrieve.
-
-  	{"swap[in]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b37-40"},
-	{"swap[out]"		,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b41-44"},
-
-	{"system[interrupts]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b57-61"},
-	{"system[switches]"	,EXECUTE, 0, "vmstat -n 1 2|tail -1|cut -b62-67"},
-***************************************/
-
-/*	{"tcp_count"		,EXECUTE, 	0, "netstat -tn|grep EST|wc -l"}, */
-/*
-	{"check_port",		CF_USEUPARAM,	CHECK_PORT,		0,	"80"},
-	{"check_service",	CF_USEUPARAM,	CHECK_SERVICE, 		0,	"ssh,127.0.0.1,22"},
-	{"check_service_perf", 	CF_USEUPARAM,	CHECK_SERVICE_PERF, 	0,	"ssh,127.0.0.1,22"},
-*/
-/*
-	{"dns",			CF_USEUPARAM,	CHECK_DNS,		0,	"127.0.0.1,localhost"},
-*/
 	{"agent.ping",		0,	AGENT_PING, 		0,	0},
 	{"agent.version",	0,	AGENT_VERSION,		0,	0},
 
 	{"kernel.maxfiles",	0,	KERNEL_MAXFILES,	0,	0},
 	{"kernel.maxproc",	0,	KERNEL_MAXPROC, 	0,	0},
 
+	{"vfs.file.exists",	CF_USEUPARAM,	VFS_FILE_EXISTS,	0,	"/etc/passwd"},
+	{"vfs.file.time",       CF_USEUPARAM,   VFS_FILE_TIME,          0,      "/etc/passwd,modify"},
+	{"vfs.file.size",	CF_USEUPARAM,	VFS_FILE_SIZE, 		0,	"/etc/passwd"},
+	{"vfs.file.regexp",	CF_USEUPARAM,	VFS_FILE_REGEXP,	0,	"/etc/passwd,root"},
+	{"vfs.file.regmatch",	CF_USEUPARAM,	VFS_FILE_REGMATCH, 	0,	"/etc/passwd,root"},
+	{"vfs.fs.size",		CF_USEUPARAM,	VFS_FS_SIZE,	0,	"/,free"},
+	{"vfs.fs.inode",	CF_USEUPARAM,	VFS_FS_INODE,	0,	"/,free"},
+
+	{"vfs.dev.read",	CF_USEUPARAM,	VFS_DEV_READ,	0,	"hda,bytes"},
+	{"vfs.dev.write",	CF_USEUPARAM,	VFS_DEV_WRITE,	0,	"hda,operations"},
+
 	{"vfs.file.cksum",	CF_USEUPARAM,	VFS_FILE_CKSUM,		0,	"/etc/services"},
 	{"vfs.file.md5sum",	CF_USEUPARAM,	VFS_FILE_MD5SUM,	0,	"/etc/services"},
 
-/************************************
- *          NEW FUNCTIONS           *
- ************************************/
-
-	{"system.cpu.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
-	{"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
 
 	{"net.tcp.dns",		CF_USEUPARAM,	CHECK_DNS,		0,	"127.0.0.1,localhost"},
-
 	{"net.tcp.listen",      CF_USEUPARAM,   NET_TCP_LISTEN, 0,      "80"},	
-
 	{"net.tcp.port",	CF_USEUPARAM,	CHECK_PORT,		0,	",80"},
 	{"net.tcp.service",	CF_USEUPARAM,	CHECK_SERVICE, 		0,	"ssh,127.0.0.1,22"},
 	{"net.tcp.service.perf",CF_USEUPARAM,	CHECK_SERVICE_PERF, 	0,	"ssh,127.0.0.1,22"},
@@ -240,19 +57,14 @@ ZBX_METRIC	parameters_specific[]=
 	{"net.if.total",	CF_USEUPARAM,	NET_IF_TOTAL,	0,	"lo,bytes"},
         {"net.if.collisions",   CF_USEUPARAM,   NET_IF_COLLISIONS,      0,      "lo"},
 
-	{"vfs.fs.size",		CF_USEUPARAM,	VFS_FS_SIZE,	0,	"/,free"},
-	{"vfs.fs.inode",	CF_USEUPARAM,	VFS_FS_INODE,	0,	"/,free"},
-
-	{"vfs.dev.read",	CF_USEUPARAM,	VFS_DEV_READ,	0,	"hda,bytes"},
-	{"vfs.dev.write",	CF_USEUPARAM,	VFS_DEV_WRITE,	0,	"hda,operations"},
-
 	{"vm.memory.size",	CF_USEUPARAM,	VM_MEMORY_SIZE,	0,	"free"},
 
 	{"proc.num",		CF_USEUPARAM,	PROC_NUM,	0,	"inetd,,"},
 	{"proc.mem",		CF_USEUPARAM,	PROC_MEMORY,	0,	"inetd,,"},
 
+	{"system.cpu.switches", 0,              SYSTEM_CPU_SWITCHES,    0,      0},
+	{"system.cpu.intr",     0,              SYSTEM_CPU_INTR,        0,      0},
 	{"system.cpu.util",	CF_USEUPARAM,	SYSTEM_CPU_UTIL,	0,	"all,idle"},
-
 	{"system.cpu.load",	CF_USEUPARAM,	SYSTEM_CPU_LOAD,	0,	"all,avg1"},
 
 	{"system.swap.size",	CF_USEUPARAM,	SYSTEM_SWAP_SIZE,	0,	"all,free"},
diff --git a/src/libs/zbxsysinfo/openbsd/sensors.c b/src/libs/zbxsysinfo/openbsd/sensors.c
index cc5a3af8..665e1d47 100644
--- a/src/libs/zbxsysinfo/openbsd/sensors.c
+++ b/src/libs/zbxsysinfo/openbsd/sensors.c
@@ -53,13 +53,12 @@ static int	get_sensor(const char *name, unsigned flags, AGENT_RESULT *result)
 
 		if(stat(filename,&buf)==0)
 		{
-			f=fopen(filename,"r");
-			if(f==NULL)
+			if(NULL == (f = fopen(filename,"r"))
 			{
 				continue;
 			}
 			fgets(line,MAX_STRING_LEN,f);
-			fclose(f);
+			zbx_fclose(f);
 
 			if(sscanf(line,"%lf\t%lf\t%lf\n",&d1, &d2, &d3) == 3)
 			{
diff --git a/src/libs/zbxsysinfo/openbsd/swap.c b/src/libs/zbxsysinfo/openbsd/swap.c
index 301a3203..dfbaba51 100644
--- a/src/libs/zbxsysinfo/openbsd/swap.c
+++ b/src/libs/zbxsysinfo/openbsd/swap.c
@@ -124,7 +124,7 @@ SWP_FNCLIST
                 return SYSINFO_RET_FAIL;
         }
 
-        if(get_param(param, 1, swapdev, MAX_STRING_LEN) != 0)
+        if(get_param(param, 1, swapdev, sizeof(swapdev)) != 0)
         {
                 return SYSINFO_RET_FAIL;
         }
@@ -132,15 +132,15 @@ SWP_FNCLIST
         if(swapdev[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(swapdev, "all");
+		zbx_snprintf(swapdev, sizeof(swapdev), "all");
 	}
 
-	if(strncmp(swapdev, "all", MAX_STRING_LEN))
+	if(strncmp(swapdev, "all", sizeof(swapdev)))
 	{
 		return SYSINFO_RET_FAIL;
 	}
 	
-	if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+	if(get_param(param, 2, mode, sizeof(mode)) != 0)
         {
                 mode[0] = '\0';
         }
@@ -148,7 +148,7 @@ SWP_FNCLIST
         if(mode[0] == '\0')
 	{
 		/* default parameter */
-		sprintf(mode, "free");
+		zbx_snprintf(mode, sizeof(mode), "free");
 	}
 
 	for(i=0; fl[i].mode!=0; i++)
@@ -253,7 +253,7 @@ int	SYSTEM_SWAP_IN(const char *cmd, const char *param, unsigned flags, AGENT_RES
         return SYSINFO_RET_FAIL;
     }
 
-    if(get_param(param, 1, swapdev, MAX_STRING_LEN) != 0)
+    if(get_param(param, 1, swapdev, sizeof(swapdev)) != 0)
     {
 	return SYSINFO_RET_FAIL;
     }
@@ -261,15 +261,15 @@ int	SYSTEM_SWAP_IN(const char *cmd, const char *param, unsigned flags, AGENT_RES
     if(swapdev[0] == '\0')
     {
 	/* default parameter */
-	sprintf(swapdev, "all");
+	zbx_snprintf(swapdev, sizeof(swapdev), "all");
     }
 
-    if(strncmp(swapdev, "all", MAX_STRING_LEN))
+    if(strncmp(swapdev, "all", sizeof(swapdev)))
     {
 	return SYSINFO_RET_FAIL;
     }
     
-    if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+    if(get_param(param, 2, mode, sizeof(mode)) != 0)
     {
         return SYSINFO_RET_FAIL;
     }
@@ -310,7 +310,7 @@ int	SYSTEM_SWAP_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RE
         return SYSINFO_RET_FAIL;
     }
 
-    if(get_param(param, 1, swapdev, MAX_STRING_LEN) != 0)
+    if(get_param(param, 1, swapdev, sizeof(swapdev)) != 0)
     {
 	return SYSINFO_RET_FAIL;
     }
@@ -318,15 +318,15 @@ int	SYSTEM_SWAP_OUT(const char *cmd, const char *param, unsigned flags, AGENT_RE
     if(swapdev[0] == '\0')
     {
 	/* default parameter */
-	sprintf(swapdev, "all");
+	zbx_snprintf(swapdev, sizeof(swapdev), "all");
     }
 
-    if(strncmp(swapdev, "all", MAX_STRING_LEN))
+    if(strncmp(swapdev, "all", sizeof(swapdev)))
     {
 	return SYSINFO_RET_FAIL;
     }
     
-    if(get_param(param, 2, mode, MAX_STRING_LEN) != 0)
+    if(get_param(param, 2, mode, sizeof(mode)) != 0)
     {
         return SYSINFO_RET_FAIL;
     }