From d7987c5e46c457ddea314ad1faa4ac8d01b07000 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 28 Mar 2013 18:50:30 +0000 Subject: [PATCH] Now that we can specify domain per node, take out check that would reject a valid config git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15708 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/perl/xCAT/Template.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/perl/xCAT/Template.pm b/xCAT-server/lib/perl/xCAT/Template.pm index d3b55a6af..3bb3e6d83 100644 --- a/xCAT-server/lib/perl/xCAT/Template.pm +++ b/xCAT-server/lib/perl/xCAT/Template.pm @@ -317,7 +317,7 @@ sub windows_account_data { } } - unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory" and $::XCATSITEVALS{domain}) { + unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory") { return $useraccountxml; } my $domain; @@ -380,7 +380,7 @@ sub windows_dns_cfg { #-Provide domain administrator credentials, avoiding the SSL scenario. This is by default forbidden as it is high risk for exposing sensitive credentials. # Also populate MachineObjectOU sub windows_join_data { - unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory" and $::XCATSITEVALS{domain}) { + unless ($::XCATSITEVALS{directoryprovider} eq "activedirectory") { return ""; } #we are still here, meaning configuration has a domain and activedirectory set, probably want to join..