Merge branch 'eduardomozart-patch-9' into develop

Changes

@@ -23,6 +23,7 @@ core:
   - Targets list also show target planned tasks for trusted clients
 * Refacto: Add Logger api to register a callback permitting to collect journaling events
 * Fix ToolBox job events support
+* Support ssl-keystore=system-ssl-ca on MacOSX to force using system known public CAs
 
 inventory:
 * Fix rare windows perl error during drives, ipv6 network or videos inventory

lib/GLPI/Agent/HTTP/Client.pm

@@ -603,9 +603,15 @@ sub _KeyChain_or_KeyStore_Export {
             SUFFIX      => ".pem",
         );
         my $file = $tmpfile->filename;
+        my $command = "security find-certificate -a -p";
+
+        # Support --ssl-keystore=system-ssl-ca option on MacOSX
+        $command .= " /System/Library/Keychains/SystemRootCertificates.keychain"
+            if $self->{ssl_keystore} && $self->{ssl_keystore} =~ /^system-ssl-ca$/i;
+
         getAllLines(
-            command => "security find-certificate -a -p > '$file'",
-            logger  => $logger
+             command => "$command > '$file'",
+             logger  => $logger
         );
         @certs = IO::Socket::SSL::Utils::PEM_file2certs($file)
             if -s $file;