forked from Lainports/freebsd-ports
fc904f521b
- security/greenbone-security-assistant[89]: Improve rc scripts - security/openvas8-manager: Fix openvas-*-sync scripts - security/openvas9-manager: Fix greenbone-*-sync scripts - Add flags option to rc scripts - Bump PORTREVISION
76 lines
2.5 KiB
C
76 lines
2.5 KiB
C
--- src/manage_sql.c 2017-06-19 08:14:58.000000000 -0500
|
|
+++ src/manage_sql.c 2017-08-05 19:47:05.407323000 -0500
|
|
@@ -58,6 +58,7 @@
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
#include <grp.h>
|
|
+#include <libgen.h>
|
|
|
|
#include <openvas/base/openvas_string.h>
|
|
#include <openvas/base/openvas_file.h>
|
|
@@ -950,7 +951,7 @@
|
|
static char time_string[100];
|
|
|
|
tm = localtime (epoch_time);
|
|
- if (timezone == 0)
|
|
+ if (tm->tm_gmtoff == 0)
|
|
{
|
|
if (strftime (time_string, 98, "%FT%TZ", tm) == 0)
|
|
return NULL;
|
|
@@ -24386,7 +24387,7 @@
|
|
{
|
|
return sql_int ("SELECT count (DISTINCT port) FROM results"
|
|
" WHERE report = %llu AND port != ''"
|
|
- " AND port NOT LIKE 'general/%';",
|
|
+ " AND port NOT LIKE 'general/%%';",
|
|
report);
|
|
}
|
|
|
|
@@ -24401,7 +24402,7 @@
|
|
{
|
|
return sql_int ("SELECT count (DISTINCT port) FROM results"
|
|
" WHERE report = %llu AND host = '%s'"
|
|
- " AND port NOT LIKE 'general/%';",
|
|
+ " AND port NOT LIKE 'general/%%';",
|
|
report,
|
|
host);
|
|
}
|
|
@@ -33237,7 +33238,7 @@
|
|
" WHERE config_preferences.config = %llu"
|
|
" AND config_preferences.type = '%s'"
|
|
" AND (config_preferences.name = nvt_preferences.name"
|
|
- " OR config_preferences.name LIKE 'timeout.%')"
|
|
+ " OR config_preferences.name LIKE 'timeout.%%')"
|
|
" AND config_preferences.name != 'max_checks'"
|
|
" AND config_preferences.name != 'max_hosts'"
|
|
" UNION"
|
|
@@ -43502,12 +43503,12 @@
|
|
if (duration == -1)
|
|
duration_string = NULL;
|
|
else
|
|
- duration_string = g_strdup_printf ("%li", duration);
|
|
+ duration_string = g_strdup_printf ("%li", (long)duration);
|
|
|
|
if (first_time == -1)
|
|
first_time_string = NULL;
|
|
else
|
|
- first_time_string = g_strdup_printf ("%li", first_time);
|
|
+ first_time_string = g_strdup_printf ("%li", (long)first_time);
|
|
|
|
if ((period_months == -1) || (period_months == 0))
|
|
{
|
|
@@ -43519,12 +43520,12 @@
|
|
else
|
|
{
|
|
period_months_string = g_strdup ("0");
|
|
- period_string = g_strdup_printf ("%li", period);
|
|
+ period_string = g_strdup_printf ("%li", (long)period);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
- period_months_string = g_strdup_printf ("%li", period_months);
|
|
+ period_months_string = g_strdup_printf ("%li", (long)period_months);
|
|
period_string = g_strdup ("0");
|
|
}
|
|
|