Merge pull request #792 from timopollmeier/prepare-v9.0.0

Small fixes for re-tagging v9.0.0
greenbone · Oct 14, 2019 · a46996f · a46996f
2 parents 12d59a3 + d6ed947
commit a46996f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [9.0.0] (2019-10-11)
 
 ### Added
-- Added TLS certificates as a new resource type [#585](https://github.com/greenbone/gvmd/pull/585) [#663](https://github.com/greenbone/gvmd/pull/663) [#673](https://github.com/greenbone/gvmd/pull/673) [#674](https://github.com/greenbone/gvmd/pull/674) [#689](https://github.com/greenbone/gvmd/pull/689) [#695](https://github.com/greenbone/gvmd/pull/695) [#703](https://github.com/greenbone/gvmd/pull/703) [#728](https://github.com/greenbone/gvmd/pull/728) [#732](https://github.com/greenbone/gvmd/pull/732) [#750](https://github.com/greenbone/gvmd/pull/750) [#752](https://github.com/greenbone/gvmd/pull/752) [#774](https://github.com/greenbone/gvmd/pull/774)
+- Added TLS certificates as a new resource type [#585](https://github.com/greenbone/gvmd/pull/585) [#663](https://github.com/greenbone/gvmd/pull/663) [#673](https://github.com/greenbone/gvmd/pull/673) [#674](https://github.com/greenbone/gvmd/pull/674) [#689](https://github.com/greenbone/gvmd/pull/689) [#695](https://github.com/greenbone/gvmd/pull/695) [#703](https://github.com/greenbone/gvmd/pull/703) [#728](https://github.com/greenbone/gvmd/pull/728) [#732](https://github.com/greenbone/gvmd/pull/732) [#750](https://github.com/greenbone/gvmd/pull/750) [#752](https://github.com/greenbone/gvmd/pull/752) [#774](https://github.com/greenbone/gvmd/pull/774) [#792](https://github.com/greenbone/gvmd/pull/792)
 - Update NVTs via OSP [#392](https://github.com/greenbone/gvmd/pull/392) [#609](https://github.com/greenbone/gvmd/pull/609) [#626](https://github.com/greenbone/gvmd/pull/626) [#753](https://github.com/greenbone/gvmd/pull/753) [#767](https://github.com/greenbone/gvmd/pull/767)
 - Handle addition of ID to NVT preferences. [#413](https://github.com/greenbone/gvmd/pull/413) [#744](https://github.com/greenbone/gvmd/pull/744)
 - Add setting 'OMP Slave Check Period' [#491](https://github.com/greenbone/gvmd/pull/491)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -51,8 +51,6 @@ if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
     else (GIT_FOUND)
       set (GIT_REVISION "~git")
     endif (GIT_FOUND)
-  else (EXISTS "${CMAKE_SOURCE_DIR}/.git/")
-    set (GIT_REVISION "~git")
   endif (EXISTS "${CMAKE_SOURCE_DIR}/.git/")
 endif (NOT CMAKE_BUILD_TYPE MATCHES "Release")
 

diff --git a/src/manage_sql_tls_certificates.c b/src/manage_sql_tls_certificates.c
@@ -608,9 +608,9 @@ make_tls_certificate (const char *name,
                quoted_serial,
                tls_certificate_format_str (certificate_format),
                old_tls_certificate);
-
-          new_tls_certificate = old_tls_certificate;
         }
+
+      new_tls_certificate = old_tls_certificate;
     }
   else
     {