From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster
---
components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
index 911bbf0..11dd113 100644
--- a/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
+++ b/components/visual-panels/usermgr/src/java/vpanels/app/usermgr/com/oracle/solaris/vp/panels/usermgr/client/swing/UserMgrPanelDescriptor.java
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
*/
package com.oracle.solaris.vp.panels.usermgr.client.swing;
@@ -86,6 +86,7 @@
private List<String> shellList = null;
private List<Group> groupList = null;
private List<String> profileList = null;
+ private List<String> authProfileList = null;
private List<String> authList = null;
private List<String> roleList = null;
private List<String> supplgroups = null;
@@ -312,6 +313,7 @@
char[] password = null;
if (umo.getPassProperty().isChanged())
password = umo.getPassword();
+ // System.out.println(umo.toString());
getUserMgrBean().modifyUser(user, password, changes);
if (password != null)
Arrays.fill(password, (char)0);
@@ -383,7 +385,7 @@
0, 0, 0, 0,
"", "", "", "", "", "",
"", "", "", "", "", "",
- null, null, null, null, null, null);
+ null, null, null, null, null, null, null);
return defaultUser;
}
--
Gitblit v1.9.3