Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d536e3b2143fe88c174c968d683c0f4f > files > 11

conga-0.12.2-24.el5_6.1.src.rpm

diff -u -r1.34.2.17 homebase_adapters.py
--- conga-0.12.2/luci/site/luci/Extensions/homebase_adapters.py	23 Apr 2008 17:27:10 -0000	1.34.2.17
+++ conga-0.12.2/luci/site/luci/Extensions/homebase_adapters.py	22 Dec 2009 04:36:29 -0000
@@ -139,6 +139,12 @@
 	if passwd != pwconfirm:
 		return (False, { 'errors': [ 'The passwords given do not match' ]})
 
+	if ":" in passwd:
+		return (False, { 'errors': [ 'The passwords cannot contain semicolons' ]})
+
+	if " " in passwd:
+		return (False, { 'errors': [ 'The passwords cannot contain spaces' ]})
+
 	user_props = {
 		'username': user,
 		'password': passwd,
diff -u -r1.50.2.7 luci_admin
--- conga-0.12.2/luci/utils/luci_admin	11 Apr 2008 06:50:33 -0000	1.50.2.7
+++ conga-0.12.2/luci/utils/luci_admin	22 Dec 2009 04:36:29 -0000
@@ -181,6 +181,10 @@
 			err.write('Spaces are not allowed in passwords\n')
 			continue
 
+		elif ':' in s1:
+			err.write('Semicolons are not allowed in passwords\n')
+			continue
+
 		s2 = getpass(confirm_prompt)
 		if s1 != s2:
 			err.write('Password mismatch, try again\n')