From 2d194c8a30a6b7bb95c01e259c6d0e67b8320454 Mon Sep 17 00:00:00 2001 From: Christoph Kraemer Date: Wed, 30 Mar 2022 14:13:07 +0200 Subject: [PATCH] Remove: wincmd (winexe) dependency --- misc/CMakeLists.txt | 1 - nasl/CMakeLists.txt | 7 +------ nasl/openvas_smb_interface.h | 2 -- nasl/smb_interface_stub.c | 18 ------------------ 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt index 7d7201eb1..001b61a3e 100644 --- a/misc/CMakeLists.txt +++ b/misc/CMakeLists.txt @@ -33,7 +33,6 @@ pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=22.4) pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.4) pkg_check_modules (OPENVAS_WMICLIENT libopenvas_wmiclient>=1.0.5) -pkg_check_modules (OPENVAS_WINCMD libopenvas_wincmd>=1.0.5) message (STATUS "Looking for pcap...") find_library (PCAP pcap) diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt index d01c27169..2bd806d46 100644 --- a/nasl/CMakeLists.txt +++ b/nasl/CMakeLists.txt @@ -55,7 +55,6 @@ pkg_check_modules (LIBGVM_BASE REQUIRED libgvm_base>=22.4) pkg_check_modules (LIBGVM_UTIL REQUIRED libgvm_util>=22.4) pkg_check_modules (OPENVAS_WMICLIENT libopenvas_wmiclient>=1.0.5) -pkg_check_modules (OPENVAS_WINCMD libopenvas_wincmd>=1.0.5) # for 'nasl' binary pkg_check_modules (LIBSSH REQUIRED libssh>=0.6.0) @@ -178,10 +177,6 @@ if (NOT OPENVAS_WMICLIENT_FOUND) set (FILES smb_interface_stub.c wmi_interface_stub.c ${FILES}) endif (NOT OPENVAS_WMICLIENT_FOUND) -if (NOT OPENVAS_WINCMD_FOUND) - set (FILES smb_interface_stub.c ${FILES}) -endif (NOT OPENVAS_WINCMD_FOUND) - if (KSBA) add_definitions (-DHAVE_LIBKSBA) endif (KSBA) @@ -219,7 +214,7 @@ target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m ${LIBGVM_BASE_LDFLAGS} ${LIBGVM_UTIL_LDFLAGS} - ${OPENVAS_WMICLIENT_LDFLAGS} ${OPENVAS_WINCMD_LDFLAGS} + ${OPENVAS_WMICLIENT_LDFLAGS} ${GNUTLS_LDFLAGS} ${PCAP_LDFLAGS} ${LIBSSH_LDFLAGS} ${KSBA_LDFLAGS} ${SNMP_LDFLAGS} ${LINKER_HARDENING_FLAGS}) diff --git a/nasl/openvas_smb_interface.h b/nasl/openvas_smb_interface.h index 34e9b8c1e..8c17b0e20 100644 --- a/nasl/openvas_smb_interface.h +++ b/nasl/openvas_smb_interface.h @@ -44,7 +44,5 @@ char * smb_file_GroupSID (SMB_HANDLE, const char *); char * smb_file_TrusteeRights (SMB_HANDLE, const char *); -int -wincmd (int argc, char *argv[], char **res); #endif diff --git a/nasl/smb_interface_stub.c b/nasl/smb_interface_stub.c index 1af5008c3..90cdfb56e 100644 --- a/nasl/smb_interface_stub.c +++ b/nasl/smb_interface_stub.c @@ -151,21 +151,3 @@ smb_file_TrusteeRights (SMB_HANDLE handle, const char *filename) (void) filename; return NULL; } - -/** - * @brief Command Execution in Windows - * - * @param[in] argc - Connection strings - * - * @param[in] argv - Number of arguments - * - * @return, 0 on success, -1 on failure - */ -int -wincmd (int argc, char *argv[], char **res) -{ - (void) argc; - (void) argv; - (void) res; - return -1; -}