Merge branch 'main' into GEA-204_usage_type_element_of_scan_configs_a…

…nd_policies_is_null
greenbone · Jun 5, 2023 · 49b8bc6 · 49b8bc6
2 parents afa3bc4 + 33ae8f7
commit 49b8bc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/.docker/prod.Dockerfile b/.docker/prod.Dockerfile
@@ -68,6 +68,9 @@ ARG DEBIAN_FRONTEND=noninteractive
 # Loading scap and cert data
 # xml-twig-tools
 
+# Required for set up certificates for GVM
+# gnutls-bin
+
 RUN apt-get update && \
     apt-get install -y --no-install-recommends \
     dpkg \
@@ -76,6 +79,7 @@ RUN apt-get update && \
     gosu \
     gnupg \
     gpgsm \
+    gnutls-bin \
     libbsd0 \
     libgpgme11 \
     libical3 \

diff --git a/.docker/start-gvmd.sh b/.docker/start-gvmd.sh
@@ -24,6 +24,11 @@
 [ -z "$GVMD_USER" ] && GVMD_USER="gvmd"
 [ -z "$PGRES_DATA"] && PGRES_DATA="/var/lib/postgresql"
 
+if [ -n "$GVM_CERTS" ] && [ "$GVM_CERTS" = true ]; then
+	echo "Generating certs"
+	gvm-manage-certs -a
+fi
+
 # check for psql connection
 FILE=$PGRES_DATA/started
 until test -f "$FILE"; do

diff --git a/src/manage.c b/src/manage.c
@@ -3089,9 +3089,12 @@ fork_cve_scan_handler (task_t task, target_t target)
         set_report_scan_run_status (global_current_report,
                                     TASK_STATUS_INTERRUPTED);
         global_current_report = (report_t) 0;
+        current_scanner_task = 0;
         return -9;
       default:
         /* Parent, successfully forked. */
+        global_current_report = 0;
+        current_scanner_task = 0;
         g_debug ("%s: %i forked %i", __func__, getpid (), pid);
         return 0;
     }