From 2cb4c75e2f97caee391120d01d63daae6d5775ab Mon Sep 17 00:00:00 2001
From: ligc <ligc@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 16 Oct 2012 12:34:41 +0000
Subject: [PATCH] undo the CMM password expire changing code

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14028 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/NetworkUtils.pm        | 5 +++++
 xCAT-server/lib/xcat/plugins/blade.pm | 2 --
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/NetworkUtils.pm b/perl-xCAT/xCAT/NetworkUtils.pm
index 093733fa3..94fde864a 100755
--- a/perl-xCAT/xCAT/NetworkUtils.pm
+++ b/perl-xCAT/xCAT/NetworkUtils.pm
@@ -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/^\///;
diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index 6a042416b..68d31889b 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -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") {