Skip to content
GitLab
Commit e09d6fc7 authored by Côme Chilliet's avatar Côme Chilliet Committed by Benoit Mortier
Browse files

Fixes #5655 PHP error in OPSI import when IP is empty

parent d3030970
dev 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 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 3 deletions
+5 -3
systems/admin/systems/class_systemImport.inc
+ 5
− 3
View file @ e09d6fc7
...@@ -84,10 +84,12 @@ class systemImport extends simplePlugin ...@@ -84,10 +84,12 @@ class systemImport extends simplePlugin
$baseObject = $tabObject->getBaseObject(); $baseObject = $tabObject->getBaseObject();
$baseObject->cn = $cn; $baseObject->cn = $cn;
$baseObject->description = $host['description']; $baseObject->description = $host['description'];
if (!is_array($host['ipAddress'])) { if (!empty($host['ipAddress'])) {
$host['ipAddress'] = array($host['ipAddress']); if (!is_array($host['ipAddress'])) {
$host['ipAddress'] = array($host['ipAddress']);
}
$baseObject->ipHostNumber = $host['ipAddress'];
} }
$baseObject->ipHostNumber = $host['ipAddress'];
$baseObject->macAddress = $host['hardwareAddress']; $baseObject->macAddress = $host['hardwareAddress'];
/* Get existing DHCP servers */ /* Get existing DHCP servers */
......
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