From dfe07a51a34083b0186a8f524d5e96138e44be52 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 14 Apr 2024 21:41:57 +0200 Subject: [PATCH] [users] Only run AD job if it is enabled (user choice) --- src/modules/users/Config.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index b98919bde..cd56bc3e2 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -1034,9 +1034,14 @@ Config::createJobs() const jobs.append( Calamares::job_ptr( j ) ); } - j = new ActiveDirectoryJob( - m_activeDirectoryAdminUsername, m_activeDirectoryAdminPassword, m_activeDirectoryDomain, m_activeDirectoryIP ); - jobs.append( Calamares::job_ptr( j ) ); + if ( getActiveDirectoryUsed() ) + { + j = new ActiveDirectoryJob( m_activeDirectoryAdminUsername, + m_activeDirectoryAdminPassword, + m_activeDirectoryDomain, + m_activeDirectoryIP ); + jobs.append( Calamares::job_ptr( j ) ); + } j = new SetupGroupsJob( this ); jobs.append( Calamares::job_ptr( j ) );