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

fixed the logic when get accounts from ppcdirect or ppchcp tables; supports groups such as cec,hmc,fsp...

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11196 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2011-12-09 05:20:47 +00:00
parent 66d3dfd4db
commit 2e8b90ba4a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
perl-xCAT/xCAT/PPCdb.pm
View File

@ -437,7 +437,7 @@ sub update_node_attribs
###########################
my @users = qw(HMC admin general);
foreach my $user ( @users ) {
my $pwhash = $db->{ppcdirect}->getAttribs( {hcp=>$predefined_node,username=>$user}, qw(password comments disable));
my $pwhash = $db->{ppcdirect}->getAttribs( {hcp=>$predefined_node,username=>$user}, qw(password comments disable)); # need regx
if ( $pwhash )
{
if ( $namediff )
@ -791,8 +791,8 @@ sub credentials {
$tab = xCAT::Table->new( $hcptab{$hwtype} );
if ( $tab ) {
my $ent;
if ( $user_specified)
{
if ( $user_specified)
{ # need regx
($ent) = $tab->getAttribs( {hcp=>$server,username=>$user},qw(password));
}
else
@ -806,15 +806,15 @@ sub credentials {
##############################################################
# If no user/passwd found, check if there is a default group
##############################################################
elsif( ($ent) = $tab->getNodeAttribs( $defaultgrp{$hwtype}, qw(username password)))
else
{
if ( $user_specified)
{
($ent) = $tab->getAttribs( {hcp=>$defaultgrp{$hwtype},username=>$user},qw(password));
{ # need regx
($ent) = $tab->getAllAttribs( {hcp=>$defaultgrp{$hwtype},username=>$user},qw(password));
}
else
{
($ent) = $tab->getNodeAttribs( $defaultgrp{$hwtype}, qw(username password));
($ent) = $tab->getNodesAttribs( $defaultgrp{$hwtype}, qw(username password));
}
if ( $ent){
if (defined($ent->{password})) { $pass = $ent->{password}; }