[Cluster-devel] conga/luci/utils luci_admin

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-06-18 15:02:48

Modified files:
	luci/utils     : luci_admin 

Log message:
	

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.14&r2=1.15

--- conga/luci/utils/luci_admin	2006/06/18 12:50:31	1.14
+++ conga/luci/utils/luci_admin	2006/06/18 15:02:47	1.15
@@ -44,6 +44,7 @@
 		except: pass
 		inituser.close()
 		return -1
+
 	inituser.write(user + ':' + password)
 	inituser.close()
 
@@ -165,23 +166,27 @@
 			props = {
 				'username': id,
 				'roles': [ 'Member' ],
-				'password': 'changeme',
-				'confirm': 'changeme',
 				'domains': [],
 				'email': email
 			}
 
-			portal_reg.addMember(id, 'changeme', props)
+			portal_reg.addMember(id, passwd, props)
+
 			member = portal_mem.getMemberById(id)
 			if not member:
 				transaction.abort()
 				sys.stderr.write('An error occurred while restoring the user \"' + id + '\"\n')
 				return -1
 
+			try:
+				aclu = app.unrestrictedTraverse('/luci/acl_users/Users/acl_users/')
+				aclu.__dict__['data'][id].__dict__['__'] = passwd
+			except:
+				transaction.abort()
+				sys.stderr.write('An error occurred while restoring the password for user \"' + id + '\"\n')
 			verbose.write('Added user \"' + id + '\"\n')
 		transaction.commit()
 
-
 	try:
 		x = app.unrestrictedTraverse('/luci/systems/storage')
 		if not x: