Add conditional build for LAPS v2

Author: august-alt

.gear/admc.spec

@@ -1,5 +1,14 @@
 %define _unpackaged_files_terminate_build 1
 
+%ifdef _priority_distbranch
+%define altbranch %_priority_distbranch
+%else
+%define altbranch %(rpm --eval %%_priority_distbranch)
+%endif
+%if "%altbranch" == "%nil"
+%define altbranch sisyphus
+%endif
+
 Name: admc
 Version: 0.19.0
 Release: alt1
@@ -25,8 +34,11 @@ BuildRequires: qt5-base-common
 BuildRequires: doxygen
 BuildRequires: libuuid-devel
 BuildRequires: libkrb5-devel
+
+%if "%altbranch" == "sisyphus" || "%altbranch" == "p11"
 BuildRequires: libcng-dpapi-devel
 BuildRequires: libgkdi-devel
+%endif
 
 Requires: libsasl2
 Requires: libsasl2-plugin-gssapi

src/admc/CMakeLists.txt

@@ -9,10 +9,19 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
 
+find_library(LIBCNG_DPAPI_LIBRARY libcng-dpapi.so)
+
 set(ADMC_APPLICATION_NAME "ADMC")
 set(ADMC_APPLICATION_DISPLAY_NAME "ADMC")
 set(ADMC_ORGANIZATION "BaseALT")
 set(ADMC_ORGANIZATION_DOMAIN "basealt.ru")
+
+if (LIBCNG_DPAPI_LIBRARY)
+    set(ADMC_ENABLE_NATIVE_LAPS 1)
+else()
+    set(ADMC_ENABLE_NATIVE_LAPS 0)
+endif()
+
 configure_file("config.h.in" "config.h")
 
 include_directories(
@@ -35,9 +44,18 @@ if (RESOLV_LIBRARY)
     link_libraries(${RESOLV_LIBRARY})
 endif()
 
-find_library(LIBCNG_DPAPI_LIBRARY libcng-dpapi.so REQUIRED)
 
-link_libraries(${LIBCNG_DPAPI_LIBRARY})
+if (LIBCNG_DPAPI_LIBRARY)
+    message("Found libcng-dpapi library in ${LIBCNG_DPAPI_LIBRARY} .")
+    link_libraries(${LIBCNG_DPAPI_LIBRARY})
+    set(LAPS_SOURCES
+        tabs/laps_v2_tab.cpp
+        attribute_edits/laps_encrypted_attribute_edit.cpp
+    )
+else()
+    message("Skipping libcng-dpapi library.")
+    set(LAPS_SOURCES "")
+endif()
 
 set(ADMC_SOURCES
     status.cpp
@@ -140,7 +158,6 @@ set(ADMC_SOURCES
     tabs/delegation_tab.cpp
     tabs/select_well_known_trustee_dialog.cpp
     tabs/laps_tab.cpp
-    tabs/laps_v2_tab.cpp
     tabs/error_tab.cpp
     tabs/group_policy_tab.cpp
 
@@ -179,7 +196,6 @@ set(ADMC_SOURCES
     attribute_edits/logon_computers_edit.cpp
     attribute_edits/logon_computers_dialog.cpp
     attribute_edits/protect_deletion_edit.cpp
-    attribute_edits/laps_encrypted_attribute_edit.cpp
     attribute_edits/laps_expiry_edit.cpp
     attribute_edits/general_name_edit.cpp
     attribute_edits/dn_edit.cpp
@@ -231,6 +247,8 @@ set(ADMC_SOURCES
     admc.qrc
 )
 
+set(ADMC_SOURCES ${ADMC_SOURCES} ${LAPS_SOURCES})
+
 add_executable(admc
     main.cpp
     ${ADMC_SOURCES}

src/admc/config.h.in

@@ -36,5 +36,7 @@
 #   define ADMC_ORGANIZATION "${ADMC_ORGANIZATION}"
 #   define ADMC_ORGANIZATION_DOMAIN "${ADMC_ORGANIZATION_DOMAIN}"
 
+#   define ADMC_ENABLE_NATIVE_LAPS @ADMC_ENABLE_NATIVE_LAPS@
+
 #endif /* __ADMC_CONFIG_H */
 

src/admc/properties_widgets/properties_dialog.cpp

@@ -24,6 +24,7 @@
 #include "adldap.h"
 #include "console_impls/object_impl.h"
 #include "globals.h"
+#include "config.h"
 #include "properties_warning_dialog.h"
 #include "security_sort_warning_dialog.h"
 #include "settings.h"
@@ -43,7 +44,9 @@
 #include "tabs/general_user_tab.h"
 #include "tabs/group_policy_tab.h"
 #include "tabs/laps_tab.h"
+#if ADMC_ENABLE_NATIVE_LAPS > 0
 #include "tabs/laps_v2_tab.h"
+#endif
 #include "tabs/managed_by_tab.h"
 #include "tabs/membership_tab.h"
 #include "tabs/object_tab.h"
@@ -240,6 +243,7 @@ PropertiesDialog::PropertiesDialog(AdInterface &ad, const QString &target_arg, C
             return out;
         }();
 
+#if ADMC_ENABLE_NATIVE_LAPS > 0
         const bool laps_v2_enabled = [&]() {
             const QList<QString> attribute_list = object.attributes();
             const bool out = ((attribute_list.contains(ATTRIBUTE_LAPS_V2_ENCRYPTED_PASSWORD)
@@ -248,17 +252,21 @@ PropertiesDialog::PropertiesDialog(AdInterface &ad, const QString &target_arg, C
                         &&    attribute_list.contains(ATTRIBUTE_LAPS_V2_EXPIRATION_TIME));
             return out;
         }();
-
+#else
+      const bool laps_v2_enabled = false;
+#endif
         if (laps_enabled && !laps_v2_enabled) {
             auto laps_tab = new LAPSTab(&edit_list, this);
             ui->tab_widget->add_tab(laps_tab, tr("LAPS"));
         }
 
+#if ADMC_ENABLE_NATIVE_LAPS > 0
         if (laps_v2_enabled)
         {
             auto laps_v2_tab = new LAPSV2Tab(&edit_list, this);
             ui->tab_widget->add_tab(laps_v2_tab, tr("LAPS"));
         }
+#endif
     }
 
     const bool need_security_tab = object.attributes().contains(ATTRIBUTE_SECURITY_DESCRIPTOR);