rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
spacewalk/certs-tools/sslToolConfig.py | 9 ++++++---
3 files changed, 11 insertions(+), 5 deletions(-)
New commits:
commit 90e03c638827acd0d64674735c1fa76e28adb8c8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 23 13:31:54 2011 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.6.3-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools
b/rel-eng/packages/spacewalk-certs-tools
index 6c2be85..819692d 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.6.2-1 spacewalk/certs-tools/
+1.6.3-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec
b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 6c36443..b152c2e 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.2
+Version: 1.6.3
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -56,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Aug 23 2011 Miroslav Suchý 1.6.3-1
+- do not fail if --set-cname is not specified
+
* Mon Aug 22 2011 Miroslav Suchý 1.6.2-1
- ability to generate multihost ssl certificate
commit 9e6885dd34be2ca7a791e7a7468612a98b7939cf
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Aug 23 13:30:41 2011 +0200
do not fail if --set-cname is not specified
addressing:
ret = _main() or 0
File "/usr/share/rhn/certs/rhn_ssl_tool.py", line 1193, in _main
genServerCertReq(DEFS, options.verbose)
File "/usr/share/rhn/certs/rhn_ssl_tool.py", line 460, in
genServerCertReq
configFile.save(d, caYN=0, verbosity=verbosity)
File "/usr/share/rhn/certs/sslToolConfig.py", line 731, in save
% (gen_req_distinguished_name(rdn), gen_req_alt_names(d))
File "/usr/share/rhn/certs/sslToolConfig.py", line 453, in
gen_req_alt_names
for name in d['--set-cname']:
TypeError: 'NoneType' object is not iterable
diff --git a/spacewalk/certs-tools/sslToolConfig.py
b/spacewalk/certs-tools/sslToolConfig.py
index 15aa963..187e594 100644
--- a/spacewalk/certs-tools/sslToolConfig.py
+++ b/spacewalk/certs-tools/sslToolConfig.py
@@ -450,9 +450,12 @@ def gen_req_alt_names(d):
""" generates the alt_names section of the *-openssl.cnf file
"""
i = 0
result = ''
- for name in d['--set-cname']:
- i += 1
- result += "DNS.%d = %s\n" % (i, name)
+ if '--set-cname' in d and d['--set-cname']:
+ for name in d['--set-cname']:
+ i += 1
+ result += "DNS.%d = %s\n" % (i, name)
+ if not result:
+ result = "DNS.1 =\n"
return result
def gen_req_distinguished_name(d):