arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

For the places that open site table to read attributes, change to call xCAT::Utils->get_site_attribute instead

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12793 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2012-05-18 09:41:31 +00:00
parent 4f3c441476
commit 67ba72c0cb
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-server/lib/xcat/plugins/activedirectory.pm
View File

@ -30,20 +30,27 @@ sub process_request {
my $command = $request->{command}->[0];
$callback = shift;
my $doreq = shift;
use Data::Dumper;
my $sitetab = xCAT::Table->new('site');
#use Data::Dumper;
#my $sitetab = xCAT::Table->new('site');
my $domain;
$domain = $sitetab->getAttribs({key=>'domain'},['value']);
if ($domain and $domain->{value}) {
$domain = $domain->{value};
#$domain = $sitetab->getAttribs({key=>'domain'},['value']);
my @domains = xCAT::Utils->get_site_attribute("domain");
my $tmp = $domains[0];
if (defined($tmp)) {
$domain = $tmp;
} else {
$domain = undef;
}
#TODO: if multi-domain support implemented, use the domains table to reference between realm and domain
my $server = $sitetab->getAttribs({key=>'directoryserver'},['value']);
my $realm = $sitetab->getAttribs({key=>'realm'},['value']);
if ($realm and $realm->{value}) {
$realm = $realm->{value};
#my $server = $sitetab->getAttribs({key=>'directoryserver'},['value']);
#my $realm = $sitetab->getAttribs({key=>'realm'},['value']);
my @directoryservers = xCAT::Utils->get_site_attribute("directoryserver");
my @realms = xCAT::Utils->get_site_attribute("realm");
my $tmp1 = $realms[0];
my $server;
my $realm;
if (defined($tmp1)) {
$realm = $tmp1;
} else {
$realm = uc($domain);
$realm =~ s/\.$//; #remove trailing dot if provided
@ -54,8 +61,9 @@ sub process_request {
xCAT::SvrUtils::sendmsg([1,"activedirectory entry missing from passwd table"], $callback);
return 1;
}
if ($server and $server->{value}) {
$server = $server->{value};
my $tmp2 = $directoryservers[0];
if (defined($tmp2)) {
$server = $tmp2;
} else {
my $res = Net::DNS::Resolver->new;
my $query = $res->query("_ldap._tcp.$domain","SRV");