Fix: use krb5-multidev

Because openvas-smb is depending on heimdal and the packages libkrb5-dev
and heimdal-dev are conflicting on some Debian version openvas-scanner
should install krb5-multidev instead.

.devcontainer/build-cmake-project.sh

@@ -7,4 +7,8 @@ cd $WORKD_DIR
 set -ex
 cmake -B build -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
 cmake --build build --target install
-sudo ldconfig
+LDCONFIG="ldconfig"
+if [ "$(id -u)" -ne 0 ]; then
+    LDCONFIG="sudo ldconfig"
+fi
+$LDCONFIG

.github/install-openvas-dependencies.sh

@@ -25,7 +25,7 @@ apt-get update && apt-get install --no-install-recommends --no-install-suggests
     libbsd-dev \
     libgnutls30 \
     libgssapi3-heimdal \
-    libkrb5-dev \
+    krb5-multidev \
     libasn1-8-heimdal \
     libroken19-heimdal \
     libhdb9-heimdal \

INSTALL.md

@@ -27,7 +27,7 @@ Prerequisites:
 * libgnutls >= 3.6.4
 * libcurl4-gnutls-dev
 * libbsd
-* libkrb5-dev
+* krb5-multidev
 
 Prerequisites for building documentation:
 * Doxygen
@@ -57,7 +57,7 @@ Install prerequisites on Debian GNU/Linux 'Bullseye' 11:
     apt-get install gcc pkg-config libssh-gcrypt-dev libgnutls28-dev \
     libglib2.0-dev libjson-glib-dev libpcap-dev libgpgme-dev bison libksba-dev \
     libsnmp-dev libgcrypt20-dev redis-server libbsd-dev libcurl4-gnutls-dev \
-    libkrb5-dev
+    krb5-multidev
 
 
 

misc/CMakeLists.txt

@@ -15,8 +15,13 @@ pkg_check_modules (GLIB REQUIRED glib-2.0>=2.42)
 pkg_check_modules (GLIB_JSON REQUIRED json-glib-1.0>=1.4.4)
 pkg_check_modules (GNUTLS REQUIRED gnutls>=3.6.4)
 pkg_check_modules (CURL REQUIRED libcurl>=7.74.0)
-pkg_check_modules (KRB5 REQUIRED krb5)
-pkg_check_modules (KRB5_GSSAPI REQUIRED krb5-gssapi)
+
+# Set the custom path for krb5-multidev
+pkg_check_modules (KRB5 REQUIRED mit-krb5)
+pkg_check_modules (KRB5_GSSAPI REQUIRED mit-krb5-gssapi)
+message(STATUS "KRB5_INCLUDE_DIRS: ${KRB5_INCLUDE_DIRS}")
+
+
 
 pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=22.4)
 pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.4)

misc/openvas-krb5.h

@@ -2,11 +2,11 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later WITH x11vnc-openssl-exception
 
-#include <krb5/krb5.h>
-#include <stdbool.h>
 #ifndef OPENVAS_KRB5
 #define OPENVAS_KRB5 1
-#include <krb5.h>
+#include <stdbool.h>
+#include <stddef.h>
+// #include <krb5/krb5.h>
 // Enables or disables the cache implementation.
 //
 // When using the cached functions it will store each credential in a memory
@@ -66,12 +66,6 @@ typedef struct
   struct OKrb5Target target;
 } OKrb5Credential;
 
-typedef struct
-{
-  krb5_data data;
-  krb5_auth_context auth_context;
-} OKrb5Data;
-
 // Finds the kdc defined for the given realm.
 //
 // It returns the found kdc into `kdc` when `kdc` is not NULL.