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

undo the CMM password expire changing code

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14028 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2012-10-16 12:34:41 +00:00
parent 9260b97282
commit 2cb4c75e2f
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perl-xCAT/xCAT/NetworkUtils.pm
View File

@ -429,6 +429,11 @@ sub ishostinsubnet {
if ($ip =~ /:/) {#ipv6
$numbits=128;
}
# IPv6 subnet with netmask postfix like /64
if ($subnet =~ /\//)
{
$subnet =~ s/\/.*$//;
}
if ($mask) {
if ($mask =~ /\//) {
$mask =~ s/^\///;

2
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -4568,8 +4568,6 @@ sub passwd {
}
return ([1, @data]);
}
# setting the password expire time to 0, never expired
$t->cmd("accseccfg -pe 0 -T system:$mm");
$mpatab->setAttribs({mpa=>$mpa,username=>$user},{password=>$pass});
if ($user eq "USERID") {