Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove: wincmd (winexe) dependency #1074

Merged
merged 1 commit into from
Apr 1, 2022
Merged

Remove: wincmd (winexe) dependency #1074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion misc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 1 addition & 6 deletions nasl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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})
Expand Down
2 changes: 0 additions & 2 deletions nasl/openvas_smb_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 0 additions & 18 deletions nasl/smb_interface_stub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}