diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-05-07 22:37:08 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-05-07 22:37:08 +0000 |
| commit | 466202e75665108f5c51c5d602d2afaabed4a027 (patch) | |
| tree | 9e953e972da8074d7fc4dfcc02f0d1a96f57db34 /pki/base/migrate | |
| parent | 2963ca4c6381e7a43fff0457fb0135476874830f (diff) | |
| download | pki-466202e75665108f5c51c5d602d2afaabed4a027.tar.gz pki-466202e75665108f5c51c5d602d2afaabed4a027.tar.xz pki-466202e75665108f5c51c5d602d2afaabed4a027.zip | |
Bugzilla Bug #492735 - Configuration wizard stores certain incorrect port
values within TPS "CS.cfg" . . .
Bugzilla Bug #495597 - Unable to access Agent page using a configured CA/KRA
containing an HSM
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@431 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/migrate')
| -rw-r--r-- | pki/base/migrate/80/MigrateSecurityDomain.java | 7 | ||||
| -rw-r--r-- | pki/base/migrate/80/schema-add.ldif | 20 |
2 files changed, 24 insertions, 3 deletions
diff --git a/pki/base/migrate/80/MigrateSecurityDomain.java b/pki/base/migrate/80/MigrateSecurityDomain.java index 5cfdf584..33bbb72b 100644 --- a/pki/base/migrate/80/MigrateSecurityDomain.java +++ b/pki/base/migrate/80/MigrateSecurityDomain.java @@ -191,6 +191,13 @@ public class MigrateSecurityDomain { attrs.add(new LDAPAttribute("SubsystemName", (String)v_name.elementAt(0))); attrs.add(new LDAPAttribute("cn", cn)); attrs.add(new LDAPAttribute("DomainManager", "true")); + // Since the initial port separation feature didn't occur + // until an RHCS 7.3 errata, simply store the "SecurePort" + // value for BOTH the "SecureAgentPort" and the + // "SecureAdminPort", and DON'T store any values for the + // "UnSecurePort" + attrs.add(new LDAPAttribute("SecureAgentPort", (String)v_port.elementAt(0))); + attrs.add(new LDAPAttribute("SecureAdminPort", (String)v_port.elementAt(0))); entry = new LDAPEntry(dn, attrs); try { diff --git a/pki/base/migrate/80/schema-add.ldif b/pki/base/migrate/80/schema-add.ldif index 7d9cec64..fe6577e5 100644 --- a/pki/base/migrate/80/schema-add.ldif +++ b/pki/base/migrate/80/schema-add.ldif @@ -11,7 +11,22 @@ attributeTypes: ( DomainManager-oid NAME 'DomainManager' SYNTAX 1.3.6.1.4.1.146 dn: cn=schema changetype: modify add: attributeTypes -attributeTypes: ( securePort-oid NAME 'securePort' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' ) +attributeTypes: ( SecurePort-oid NAME 'SecurePort' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' ) + +dn: cn=schema +changetype: modify +add: attributeTypes +attributeTypes: ( SecureAgentPort-oid NAME 'SecureAgentPort' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' ) + +dn: cn=schema +changetype: modify +add: attributeTypes +attributeTypes: ( SecureAdminPort-oid NAME 'SecureAdminPort' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' ) + +dn: cn=schema +changetype: modify +add: attributeTypes +attributeTypes: ( UnSecurePort-oid NAME 'UnSecurePort' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' ) dn: cn=schema changetype: modify @@ -31,6 +46,5 @@ objectClasses: ( pkiSecurityGroup-oid NAME 'pkiSecurityGroup' DESC 'CMS defined dn: cn=schema changetype: modify add: objectClasses -objectClasses: ( pkiSubsystem-oid NAME 'pkiSubsystem' DESC 'CMS defined class' SUP top STRUCTURAL MUST ( cn $ Host $ SecurePort $ SubsystemName $ Clone ) MAY ( DomainManager ) X-ORIGIN 'user defined' ) - +objectClasses: ( pkiSubsystem-oid NAME 'pkiSubsystem' DESC 'CMS defined class' SUP top STRUCTURAL MUST ( cn $ Host $ SecurePort $ SubsystemName $ Clone ) MAY ( DomainManager $ SecureAgentPort $ SecureAdminPort $ UnSecurePort ) X-ORIGIN 'user defined' ) |