Author: jfthomps
Date: Thu May 11 14:19:07 2017
New Revision: 1794841
URL: http://svn.apache.org/viewvc?rev=1794841&view=rev
Log:
VCL-277 - Add support for images to join Active Directory domains
VCL-867 - Active Directory Authentication for Windows VM's
xmlrpcWrappers.php: modified XMLRPCautoCapture: added adauthenabled to $data
array passed to $obj->addResource; set its value from base image; if value is
1, also add addomainid and baseou from base image; this was causing auto
captures to fail because adauthenabled was not definied when referenced in
addResource
Modified:
vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
Modified: vcl/trunk/web/.ht-inc/xmlrpcWrappers.php
URL:
http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/xmlrpcWrappers.php?rev=1794841&r1=1794840&r2=1794841&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/xmlrpcWrappers.php (original)
+++ vcl/trunk/web/.ht-inc/xmlrpcWrappers.php Thu May 11 14:19:07 2017
@@ -1353,7 +1353,12 @@ function XMLRPCautoCapture($requestid) {
'reload' => 20,
'comments' => $comments,
'connectmethodids' => implode(',',
array_keys($connectmethods)),
+ 'adauthenabled' =>
$imageData[$imageid]['adauthenabled'],
'autocaptured' => 1);
+ if($data['adauthenabled']) {
+ $data['addomainid'] =
$imageData[$imageid]['addomainid'];
+ $data['baseou'] = $imageData[$imageid]['baseOU'];
+ }
$obj = new Image();
$imageid = $obj->addResource($data);
if($imageid == 0) {
