From 4b562663927d0f6cfa95b7016d42324ab19b2071 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 21 May 2026 21:26:13 +0200 Subject: [PATCH] Add back smart_userlist --- CMakeLists.txt | 7 ++++++ cupsutils.cmake | 64 ------------------------------------------------- 2 files changed, 7 insertions(+), 64 deletions(-) delete mode 100644 cupsutils.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c8d52e..07f3106 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,6 +71,7 @@ INCLUDE_DIRECTORIES( add_executable(nwwebui nwwebui.c) add_executable(check_login check_login.c) +add_executable(smart_userlist smart_userlist.c) ################################# # Linking @@ -86,6 +87,11 @@ target_link_libraries(check_login ${DL_LIBRARY} ) +target_link_libraries(smart_userlist + ${PAM_LIBRARY} + ${DL_LIBRARY} +) + ################################# # Install Files ############## @@ -129,6 +135,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mars-nwe-webui.service DESTINATION ${S endif() install(TARGETS check_login DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXECDIR}) +install(TARGETS smart_userlist DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXECDIR}) install(TARGETS nwwebui DESTINATION ${CMAKE_INSTALL_SBINDIR}) diff --git a/cupsutils.cmake b/cupsutils.cmake deleted file mode 100644 index a3d6ac3..0000000 --- a/cupsutils.cmake +++ /dev/null @@ -1,64 +0,0 @@ -# Optional CUPS command line utility support for SMArT WebUI. -# -# This module intentionally searches for the CUPS command line utilities -# used by the WebUI, not for libcups development headers/libraries. -# -# Variables exported: -# -# WITH_CUPSUTILS -# User option to enable/disable CUPS utility discovery. -# -# HAVE_CUPSUTILS -# ON when the required CUPS utilities were found. -# -# SMART_CUPS_ENABLE -# 1 when HAVE_CUPSUTILS is ON, otherwise 0. Intended for configure_file() -# into Perl config files. -# -# CUPS_LPSTAT_EXECUTABLE -# Path to lpstat. -# -# CUPS_LP_EXECUTABLE -# Path to lp. -# -# CUPS_LPR_EXECUTABLE -# Optional path to lpr, if available. - -option(WITH_CUPSUTILS "Enable CUPS utility support for SMArT WebUI" ON) - -set(HAVE_CUPSUTILS OFF) -set(SMART_CUPS_ENABLE 0) - -if(WITH_CUPSUTILS) - find_program(CUPS_LPSTAT_EXECUTABLE NAMES lpstat) - find_program(CUPS_LP_EXECUTABLE NAMES lp) - find_program(CUPS_LPR_EXECUTABLE NAMES lpr) - - if(CUPS_LPSTAT_EXECUTABLE AND CUPS_LP_EXECUTABLE) - set(HAVE_CUPSUTILS ON) - set(SMART_CUPS_ENABLE 1) - message(STATUS "Found CUPS utilities: lpstat=${CUPS_LPSTAT_EXECUTABLE}, lp=${CUPS_LP_EXECUTABLE}") - if(CUPS_LPR_EXECUTABLE) - message(STATUS "Found optional CUPS lpr utility: ${CUPS_LPR_EXECUTABLE}") - endif() - else() - message(STATUS "CUPS utilities not found; SMArT WebUI CUPS printer discovery disabled") - endif() -else() - message(STATUS "CUPS utility support disabled") -endif() - -# Provide stable fallback strings for configure_file() consumers. These are -# only used when SMART_CUPS_ENABLE is 0 or when the admin later overrides the -# paths in smart.conf. -if(NOT CUPS_LPSTAT_EXECUTABLE) - set(CUPS_LPSTAT_EXECUTABLE "/usr/bin/lpstat") -endif() - -if(NOT CUPS_LP_EXECUTABLE) - set(CUPS_LP_EXECUTABLE "/usr/bin/lp") -endif() - -if(NOT CUPS_LPR_EXECUTABLE) - set(CUPS_LPR_EXECUTABLE "/usr/bin/lpr") -endif()