java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java | 12 +---------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 4c159a150fe3a6b5153ee13b7a0b603d292b3be8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 16 14:29:29 2013 +0100
Copy RHN-ORG-TRUSTED-SSL-CERT if it exists, not a random SSL key.
diff --git a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
index 32d32f5..0b8b7b3 100644
--- a/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/org/CreateOrgCommand.java
@@ -147,16 +147,8 @@ public class CreateOrgCommand {
// Lookup the SSL crypto key for the default org and copy it to the new:
Org defaultOrg = OrgFactory.getSatelliteOrg();
- List<CryptoKey> defaultOrgKeys =
KickstartFactory.lookupCryptoKeys(defaultOrg);
- CryptoKey ssl = null;
- // Search for the first key of type ssl:
- for (CryptoKey key : defaultOrgKeys) {
- if (key.getCryptoKeyType().equals(KickstartFactory.KEY_TYPE_SSL)) {
- ssl = key;
- break;
- }
- }
- if (ssl != null) {
+ CryptoKey ssl =
KickstartFactory.lookupCryptoKey("RHN-ORG-TRUSTED-SSL-CERT", defaultOrg);
+ if (ssl != null && ssl.isSSL()) {
// TODO
log.debug("Found a SSL key for the default org to copy: " +
ssl.getId());
Show replies by date