[pve-devel] r4854 - pve-access-control/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-07-01 06:55:15 +0000 (Thu, 01 Jul 2010)
New Revision: 4854

Modified:
   pve-access-control/trunk/AccessControl.pm
   pve-access-control/trunk/pveum
Log:
fix password option for usermod


Modified: pve-access-control/trunk/AccessControl.pm
===================================================================
--- pve-access-control/trunk/AccessControl.pm	2010-06-30 05:37:46 UTC (rev 4853)
+++ pve-access-control/trunk/AccessControl.pm	2010-07-01 06:55:15 UTC (rev 4854)
@@ -469,7 +469,7 @@
     } else {
 
 	die "user '$username' does not exist\n" if !$usercfg->{users}->{$username};
-
+	store_shadow_passwd() if !$domain && $opts->{passwd};
 	enable_user ($username,$usercfg) if $opts->{unlock} &&
 	    !$usercfg->{users}->{$username}->{enabled};
 	disable_user ($username,$usercfg) if $opts->{lock} &&

Modified: pve-access-control/trunk/pveum
===================================================================
--- pve-access-control/trunk/pveum	2010-06-30 05:37:46 UTC (rev 4853)
+++ pve-access-control/trunk/pveum	2010-07-01 06:55:15 UTC (rev 4854)
@@ -97,7 +97,8 @@
         $opts->{lock};
 
     my $username = shift;
-
+    $opts->{password} = read_password() if $opts->{password};
+    
     PVE::AccessControl::modify_user($username, $opts);
 
     exit(0);