Skip to content
GitLab
Commit 4de5b678 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(systemImport): Avoid dependency toward dns and dhcp for import 

This avoids a crash when trying to import OPSI hosts while DHCP plugin
 is not installed.

issue #5766
parent 9d3089e1
dev 6104-mail-methods-refactor 6231-give-the-ability-to-the-webservice-to-notice-if-an-attribute-is-monovalued-or-multivalued 6237-add-requiredattrs-array-to-the-webservice-informations 6245-adapt-the-ci-to-the-reorganisation-of-the-dev-tools-and-fixing-the-trigger-downstream-pipelines 6250-supann-configuration-backend-requires-account-life-cycle-section 6280-plugins-update-plugins-to-take-into-consideration-the-new-directory-of-core-structure 6310-tasks-reminder-error-in-the-schema-duplicate-attribute-id 6311-put-the-version-1-5-in-all-yaml-for-fusiondirectory-1-5 6322-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen-2 6332-zimbra-allows-update-of-data-for-unknown-domain-name-for-specific-individual-aliases 6337-webservice-issue-with-archiving-post-request-not-responding-but-successfully-archiving-user 6341-supann-extract-resources-states-sub-states-from-backend-configuration-to-their-own-objects 6346-lifecycle-adaptation-to-select-supann-resources-and-related-states-via-regex-mechanism master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 3 deletions
+7 -3
systems/admin/systems/class_systemImport.inc
+ 7
− 3
View file @ 4de5b678
...@@ -41,7 +41,11 @@ class systemImport extends simplePlugin ...@@ -41,7 +41,11 @@ class systemImport extends simplePlugin
$messages = array(); $messages = array();
$dhcps = array(); $dhcps = array();
$dns = objects::ls('dnsZone'); try {
$dns = objects::ls('dnsZone');
} catch (NonExistingObjectTypeException $e) {
$dns = array();
}
if (!empty($template_dn)) { if (!empty($template_dn)) {
$template = new template($type, $template_dn); $template = new template($type, $template_dn);
} }
...@@ -95,7 +99,7 @@ class systemImport extends simplePlugin ...@@ -95,7 +99,7 @@ class systemImport extends simplePlugin
$tabObject = $template->apply(); $tabObject = $template->apply();
} }
if (!$tabObject->by_object['dhcpSystem']->is_account) { if (class_available('dhcpSystem') && !$tabObject->by_object['dhcpSystem']->is_account) {
/* Get existing DHCP servers */ /* Get existing DHCP servers */
if (empty($dhcps)) { if (empty($dhcps)) {
list(, $dhcpParentNodes) = dhcpSystem::getDhcpParentNodes(); list(, $dhcpParentNodes) = dhcpSystem::getDhcpParentNodes();
...@@ -125,7 +129,7 @@ class systemImport extends simplePlugin ...@@ -125,7 +129,7 @@ class systemImport extends simplePlugin
} }
} }
if (!$tabObject->by_object['dnsHost']->is_account) { if (class_available('dnsHost') && !$tabObject->by_object['dnsHost']->is_account) {
/* Activate DNS if we find a matching server */ /* Activate DNS if we find a matching server */
foreach ($dns as $dn => $value) { foreach ($dns as $dn => $value) {
if (preg_match('/^'.$zone.'\.?$/', $value)) { if (preg_match('/^'.$zone.'\.?$/', $value)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment