CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2007-10-03 02:16:06
Modified files:
. : conga.spec.in.in
luci/site/luci/Extensions: FenceHandler.py
make : version.in
Log message:
Fix regression of bz249097
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.60&r2=1.45.2.61
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/FenceHandler.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4.2.9&r2=1.4.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.24&r2=1.21.2.25
--- conga/conga.spec.in.in 2007/08/27 18:42:17 1.45.2.60
+++ conga/conga.spec.in.in 2007/10/03 02:16:06 1.45.2.61
@@ -310,6 +310,9 @@
### changelog ###
%changelog
+* Tue Oct 02 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.1-1
+* Fix regression of bz249097
+
* Mon Aug 27 2007 Ryan McCabe <[EMAIL PROTECTED]> 0.10.0-6
- Fixed bz253783
- Fixed bz253914 (conga doesn't allow you to reuse nfs export and nfs client
resources)
--- conga/luci/site/luci/Extensions/FenceHandler.py 2007/08/01 19:53:34
1.4.2.9
+++ conga/luci/site/luci/Extensions/FenceHandler.py 2007/10/03 02:16:06
1.4.2.10
@@ -291,7 +291,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -340,7 +344,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -381,7 +389,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -430,7 +442,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -505,7 +521,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -554,7 +574,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -603,7 +627,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -657,7 +685,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -706,7 +738,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -776,12 +812,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- if form['passwd']:
- # allow passwords consisting of nothing but
whitespace
- fencedev.addAttribute('passwd', form['passwd'])
- else:
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
raise Exception, 'blank'
-
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
@@ -852,7 +887,11 @@
try:
pwd = form['passwd'].strip()
if not pwd:
- raise Exception, 'blank'
+ # Allow passwords that consist of only spaces.
+ if not form.has_key('passwd') or form['passwd'] == '':
+ raise Exception, 'blank'
+ else:
+ pwd = form['passwd']
fencedev.addAttribute('passwd', pwd)
has_passwd = True
except Exception, e:
--- conga/make/version.in 2007/08/23 04:58:30 1.21.2.24
+++ conga/make/version.in 2007/10/03 02:16:06 1.21.2.25
@@ -1,5 +1,5 @@
-VERSION=0.10.0
-RELEASE=6
+VERSION=0.10.1
+RELEASE=1
# Remove "_UNRELEASED" at release time.
# Put release num at the beggining,
# so that after it gets released, it has
