[Pki-devel] [PATCH] RHCS 8.1 - SAN Multi-Host Patches [20130413]
Matthew Harmsen
mharmsen at redhat.com
Sun Apr 14 06:14:39 UTC 2013
Please review the attached patches which seek to implement '*Bugzilla
Bug #902956* <https://bugzilla.redhat.com/show_bug.cgi?id=902956>-[RFE]
Cert System 8.1 - Provide automated option for IP separated
configuration' for RHCS 8.1.
Three new patches (two which are revisions to the previous patches, and
one which represents a simple recursive diffs between the two 'pki'
trees which contain the code changes) have been attached whichaddress
the remaining issues.
* This version of the code has been tested utilizing the following
configuration:
o pki-ip-host (installation host - RHEL 5.9 x86_64)
+ pki-ca-agent (CA agent interface - virtual IP)
+ pki-ca-ee (CA EE interface- virtual IP)
+ pki-ca-ee-ca (CA EE clientauth interface- virtual IP)
+ pki-ca-admin (CA admin interface- virtual IP)
+ pki-kra-agent (KRA agent interface- virtual IP)
+ pki-kra-ee (KRA EE interface- virtual IP)
+ pki-kra-admin (KRA admin interface- virtual IP)
o pki-rhel6 (RHDS 9.1 - RHEL 6.3 x86_64 which uses a different domain)
* Tests utilizing the browser GUI interface have been tested
successfully for the following PKI subsystems:
o CA using four VIPs
o KRA using three VIPs
o OCSP (was never tested, but is strongly believed to work since
the batch 'pkisilent' worked successfully)
o TKS using 'pki-ip-host' as the address for all three hosts
o RAconnecting to this CA
o TPS connecting to this CA, KRA, and TKS
* Tests utilizing new'pkisilent'batch process templates, the following
PKI subsystems have been tested successfully:
o CA using four VIPs
o KRA using three VIPs
o OCSPusing 'pki-ip-host' as the address for all three hosts
o TKS using 'pki-ip-host' as the address for all three hosts
o RA failed to connect to this CA (Bugzilla Bug #951891 filed)
o TPS connecting to this CA, KRA, and TKS
* Bugs have been filed for all remaining issues (many of which may be
addressable duringthe Q/E test cycle):
o *Bugzilla Bug #224770*
<https://bugzilla.redhat.com/show_bug.cgi?id=224770>-Apply "use
strict" methodology to
"pkicommon/pkicreate/pkiremove/pkicomplete" . . .
o *Bugzilla Bug #951886*
<https://bugzilla.redhat.com/show_bug.cgi?id=951886>-Refactor
'get_port_configuration_mode()' in 'pkicommon'
o *Bugzilla Bug #951887*
<https://bugzilla.redhat.com/show_bug.cgi?id=951887>-Use of
unlabelled SELinux ports on VIPs to support 'IP Separation'
o *Bugzilla Bug #951890*
<https://bugzilla.redhat.com/show_bug.cgi?id=951890>-Include
default EE clientauth port (9446) in pki-selinux policy
o *Bugzilla Bug #951891*
<https://bugzilla.redhat.com/show_bug.cgi?id=951891>-'silent_ra_to_ip_port.template'
fails to configure an RA successfully
o *Bugzilla Bug #910175*
<https://bugzilla.redhat.com/show_bug.cgi?id=910175>-[DOC] Cert
System 8.1 - IP Port Separation Configuration Mode (additional
material has been added to this bug)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20130413/ea82c19b/attachment.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20130413_redhat_san_multi_host.patch
Type: text/x-patch
Size: 3821 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20130413/ea82c19b/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 20130413_san_multi_host.patch
Type: text/x-patch
Size: 483959 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/pki-devel/attachments/20130413/ea82c19b/attachment-0001.bin>
-------------- next part --------------
diff -r 20130410/pki/.svn/entries 20130413/pki/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-12T02:57:05.580597Z
> 2563
diff -r 20130410/pki/base/.svn/entries 20130413/pki/base/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-12T02:57:05.580597Z
> 2563
diff -r 20130410/pki/base/ca/.svn/entries 20130413/pki/base/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/config/.svn/entries 20130413/pki/base/ca/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/doc/.svn/entries 20130413/pki/base/ca/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/setup/.svn/entries 20130413/pki/base/ca/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/.svn/entries 20130413/pki/base/ca/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/alias/.svn/entries 20130413/pki/base/ca/shared/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/conf/.svn/entries 20130413/pki/base/ca/shared/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/emails/.svn/entries 20130413/pki/base/ca/shared/emails/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/etc/.svn/entries 20130413/pki/base/ca/shared/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/etc/init.d/.svn/entries 20130413/pki/base/ca/shared/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/logs/.svn/entries 20130413/pki/base/ca/shared/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/logs/signedAudit/.svn/entries 20130413/pki/base/ca/shared/logs/signedAudit/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/profiles/.svn/entries 20130413/pki/base/ca/shared/profiles/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/profiles/ca/.svn/entries 20130413/pki/base/ca/shared/profiles/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/shared/.svn/entries 20130413/pki/base/ca/shared/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/shared/classes/.svn/entries 20130413/pki/base/ca/shared/shared/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/shared/lib/.svn/entries 20130413/pki/base/ca/shared/shared/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/temp/.svn/entries 20130413/pki/base/ca/shared/temp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/.svn/entries 20130413/pki/base/ca/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/ROOT/.svn/entries 20130413/pki/base/ca/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/ROOT/WEB-INF/.svn/entries 20130413/pki/base/ca/shared/webapps/ROOT/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/ca/.svn/entries 20130413/pki/base/ca/shared/webapps/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/ca/WEB-INF/.svn/entries 20130413/pki/base/ca/shared/webapps/ca/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/webapps/ca/WEB-INF/classes/.svn/entries 20130413/pki/base/ca/shared/webapps/ca/WEB-INF/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/shared/work/.svn/entries 20130413/pki/base/ca/shared/work/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/src/.svn/entries 20130413/pki/base/ca/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/src/com/.svn/entries 20130413/pki/base/ca/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/src/com/netscape/.svn/entries 20130413/pki/base/ca/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ca/src/com/netscape/ca/.svn/entries 20130413/pki/base/ca/src/com/netscape/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/.svn/entries 20130413/pki/base/common/.svn/entries
4c4
< 2554
---
> 2564
10,12c10,12
< 2013-04-04T19:28:43.276281Z
< 2553
< vakwetu
---
> 2013-04-12T01:14:49.624638Z
> 2561
> awnuk
diff -r 20130410/pki/base/common/config/.svn/entries 20130413/pki/base/common/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/scripts/.svn/entries 20130413/pki/base/common/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/setup/.svn/entries 20130413/pki/base/common/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/.svn/entries 20130413/pki/base/common/src/.svn/entries
4c4
< 2554
---
> 2564
10,12c10,12
< 2013-04-04T19:28:43.276281Z
< 2553
< vakwetu
---
> 2013-04-12T01:14:49.624638Z
> 2561
> awnuk
diff -r 20130410/pki/base/common/src/com/.svn/entries 20130413/pki/base/common/src/com/.svn/entries
4c4
< 2554
---
> 2564
10,12c10,12
< 2013-04-04T19:28:43.276281Z
< 2553
< vakwetu
---
> 2013-04-12T01:14:49.624638Z
> 2561
> awnuk
diff -r 20130410/pki/base/common/src/com/netscape/.svn/entries 20130413/pki/base/common/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
10,12c10,12
< 2013-04-04T19:28:43.276281Z
< 2553
< vakwetu
---
> 2013-04-12T01:14:49.624638Z
> 2561
> awnuk
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/acls/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/acls/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/apps/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/apps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/authentication/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/authority/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/authority/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/authorization/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/authorization/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/base/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/base/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/ca/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/cert/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/cert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/client/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/client/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/client/connection/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/client/connection/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/common/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/connector/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/connector/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/certdb/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/certdb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/crldb/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/crldb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/keydb/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/keydb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/replicadb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/dbs/repository/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/dbs/repository/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/evaluators/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/evaluators/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/extensions/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/extensions/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/jobs/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/jobs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/kra/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/ldap/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/ldap/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/listeners/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/listeners/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/logging/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/logging/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/notification/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/notification/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/ocsp/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/password/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/password/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/pattern/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/pattern/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/policy/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/policy/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/profile/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/profile/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/property/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/property/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/publish/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/publish/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/ra/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/registry/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/registry/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/request/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/request/ldap/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/request/ldap/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/security/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/security/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/selftests/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/selftests/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/template/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/template/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/tks/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/usrgrp/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/usrgrp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/certsrv/util/.svn/entries 20130413/pki/base/common/src/com/netscape/certsrv/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/authentication/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/authorization/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/authorization/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/crl/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/crl/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/evaluators/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/evaluators/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/jobs/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/jobs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/listeners/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/listeners/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/logging/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/logging/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/notification/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/notification/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/ocsp/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/password/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/password/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/policy/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/policy/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/policy/constraints/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/policy/constraints/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/policy/extensions/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/policy/extensions/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/common/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/constraint/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/constraint/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/def/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/def/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/input/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/input/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/output/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/output/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/profile/updater/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/profile/updater/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/publish/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/publish/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/publish/mappers/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/publish/mappers/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/publish/publishers/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/publish/publishers/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/request/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/ca/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/common/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/kra/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/ocsp/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/ra/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/selftests/tks/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/selftests/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/admin/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/base/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/base/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/cert/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/cert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/cert/scep/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/cert/scep/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/common/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/connector/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/connector/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/csadmin/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/csadmin/.svn/entries
4c4
< 2554
---
> 2564
1015c1015
< ConfigBaseServlet.java
---
> ModulePanel.java
1022c1022
< b1b214658458f99043447ce1e88d6cca
---
> e7feabb12b8ab2fbde2bb9602b39f8c5
1047c1047
< 4789
---
> 11260
1049c1049
< ModulePanel.java
---
> ConfigCertApprovalCallback.java
1056c1056
< e7feabb12b8ab2fbde2bb9602b39f8c5
---
> 2ee299e600427067c47a6b787ba254ce
1081c1081
< 11260
---
> 1227
1083c1083
< ConfigCertApprovalCallback.java
---
> ConfigBaseServlet.java
1090c1090
< 2ee299e600427067c47a6b787ba254ce
---
> b1b214658458f99043447ce1e88d6cca
1115c1115
< 1227
---
> 4789
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/filter/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/filter/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/key/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/key/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/ocsp/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/processors/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/processors/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/profile/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/profile/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/request/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/tks/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/servlet/wizard/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/servlet/wizard/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cms/shares/.svn/entries 20130413/pki/base/common/src/com/netscape/cms/shares/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T18:37:47.645623Z
< 2551
---
> 2013-04-12T01:14:49.624638Z
> 2561
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/apps/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/apps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/authentication/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/authorization/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/authorization/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/base/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/base/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/cert/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/cert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/connector/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/connector/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/crmf/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/crmf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/dbs/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/dbs/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T18:37:47.645623Z
< 2551
---
> 2013-04-12T01:14:49.624638Z
> 2561
1123,1126c1123,1126
< 2013-04-04T21:03:31.000000Z
< 6c11a67fb64a9df957d6440e9f4ac9a3
< 2013-04-04T18:37:47.645623Z
< 2551
---
> 2013-04-13T02:42:09.000000Z
> f7df82e8089417bb636e2bcdda9df274
> 2013-04-12T01:14:49.624638Z
> 2561
1149c1149
< 83986
---
> 85390
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/dbs/.svn/text-base/CertificateRepository.java.svn-base 20130413/pki/base/common/src/com/netscape/cmscore/dbs/.svn/text-base/CertificateRepository.java.svn-base
61a62
> private static final String PROP_MINIMUM_RANDOM_BITS = "minimumRandomBits";
155a157
> CMS.debug("CertificateRepository: getRandomNumber mRangeSize="+mRangeSize);
156a159
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength);
158c161
< rid = -1; // shared ranges using replica IDs are postponed
---
> CMS.debug("CertificateRepository: getRandomNumber rid="+rid);
163a167
> mReplicaBitLength = 0; // shared ranges using replica IDs are postponed
164a169,171
> CMS.debug("CertificateRepository: getRandomNumber mRandomRangeSize="+mRandomRangeSize);
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength+
> " -mReplicaBitLength="+mReplicaBitLength+" >mMinRandomBitLength="+mMinRandomBitLength);
166a174,175
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength+
> " -mReplicaBitLength="+mReplicaBitLength+" <mMinRandomBitLength="+mMinRandomBitLength);
185c194
< nextSerialNumber = (nextSerialNumber.add(mMinSerialNo)).subtract(BigInteger.ONE);
---
> nextSerialNumber = nextSerialNumber.add(mMinSerialNo);
373c382
< CMS.debug("CertificateRepository: getInRangeCounter: c=" + c + ((t != null)?(" t="+t):""));
---
> CMS.debug("CertificateRepository: getInRangeCounter: c=" + c + ((t != null)?(" t="+t):"null"));
377c386,395
< if (t != null) {
---
> if (CMS.isPreOpMode()) {
> CMS.debug("CertificateRepository: getInRangeCounter: CMS.isPreOpMode");
> counter = new BigInteger("-2");
> mDBConfig.putString(PROP_RANDOM_SERIAL_NUMBER_COUNTER, "-2");
> try {
> CMS.getConfigStore().commit(false);
> } catch (Exception e) {
> CMS.debug("CertificateRepository: updateCounter Exception committing ConfigStore="+e.getMessage());
> }
> } else if (t != null) {
382c400
< } else if (s.equals("-2") || (c.equals("-1") && CMS.isPreOpMode())) {
---
> } else if (s.equals("-2")) {
406a425
> mMinRandomBitLength = mDBConfig.getInteger(PROP_MINIMUM_RANDOM_BITS, 4);
412a432
> " mMinRandomBitLength="+mMinRandomBitLength+
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java 20130413/pki/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java
50c50
< * @version $Revision: 2551 $, $Date: 2013-04-04 14:37:47 -0400 (Thu, 04 Apr 2013) $
---
> * @version $Revision: 2561 $, $Date: 2013-04-11 21:14:49 -0400 (Thu, 11 Apr 2013) $
61a62
> private static final String PROP_MINIMUM_RANDOM_BITS = "minimumRandomBits";
155a157
> CMS.debug("CertificateRepository: getRandomNumber mRangeSize="+mRangeSize);
156a159
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength);
158c161
< rid = -1; // shared ranges using replica IDs are postponed
---
> CMS.debug("CertificateRepository: getRandomNumber rid="+rid);
163a167
> mReplicaBitLength = 0; // shared ranges using replica IDs are postponed
164a169,171
> CMS.debug("CertificateRepository: getRandomNumber mRandomRangeSize="+mRandomRangeSize);
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength+
> " -mReplicaBitLength="+mReplicaBitLength+" >mMinRandomBitLength="+mMinRandomBitLength);
166a174,175
> CMS.debug("CertificateRepository: getRandomNumber mBitLength="+mBitLength+
> " -mReplicaBitLength="+mReplicaBitLength+" <mMinRandomBitLength="+mMinRandomBitLength);
185c194
< nextSerialNumber = (nextSerialNumber.add(mMinSerialNo)).subtract(BigInteger.ONE);
---
> nextSerialNumber = nextSerialNumber.add(mMinSerialNo);
373c382
< CMS.debug("CertificateRepository: getInRangeCounter: c=" + c + ((t != null)?(" t="+t):""));
---
> CMS.debug("CertificateRepository: getInRangeCounter: c=" + c + ((t != null)?(" t="+t):"null"));
377c386,395
< if (t != null) {
---
> if (CMS.isPreOpMode()) {
> CMS.debug("CertificateRepository: getInRangeCounter: CMS.isPreOpMode");
> counter = new BigInteger("-2");
> mDBConfig.putString(PROP_RANDOM_SERIAL_NUMBER_COUNTER, "-2");
> try {
> CMS.getConfigStore().commit(false);
> } catch (Exception e) {
> CMS.debug("CertificateRepository: updateCounter Exception committing ConfigStore="+e.getMessage());
> }
> } else if (t != null) {
382c400
< } else if (s.equals("-2") || (c.equals("-1") && CMS.isPreOpMode())) {
---
> } else if (s.equals("-2")) {
406a425
> mMinRandomBitLength = mDBConfig.getInteger(PROP_MINIMUM_RANDOM_BITS, 4);
412a432
> " mMinRandomBitLength="+mMinRandomBitLength+
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/extensions/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/extensions/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/jobs/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/jobs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/ldap/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/ldap/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/ldapconn/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/ldapconn/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/listeners/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/listeners/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/logging/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/logging/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/notification/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/notification/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/policy/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/policy/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/profile/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/profile/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/registry/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/registry/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/request/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/security/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/security/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/selftests/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/selftests/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/time/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/time/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/usrgrp/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/usrgrp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/src/com/netscape/cmscore/util/.svn/entries 20130413/pki/base/common/src/com/netscape/cmscore/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/.svn/entries 20130413/pki/base/common/test/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/.svn/entries 20130413/pki/base/common/test/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/.svn/entries 20130413/pki/base/common/test/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/certsrv/.svn/entries 20130413/pki/base/common/test/com/netscape/certsrv/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/certsrv/app/.svn/entries 20130413/pki/base/common/test/com/netscape/certsrv/app/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/certsrv/authentication/.svn/entries 20130413/pki/base/common/test/com/netscape/certsrv/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/certsrv/logging/.svn/entries 20130413/pki/base/common/test/com/netscape/certsrv/logging/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/certsrv/request/.svn/entries 20130413/pki/base/common/test/com/netscape/certsrv/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/cmscore/.svn/entries 20130413/pki/base/common/test/com/netscape/cmscore/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/cmscore/dbs/.svn/entries 20130413/pki/base/common/test/com/netscape/cmscore/dbs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/cmscore/request/.svn/entries 20130413/pki/base/common/test/com/netscape/cmscore/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/common/test/com/netscape/cmscore/test/.svn/entries 20130413/pki/base/common/test/com/netscape/cmscore/test/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/config/.svn/entries 20130413/pki/base/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/.svn/entries 20130413/pki/base/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/config/.svn/entries 20130413/pki/base/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/.svn/entries 20130413/pki/base/console/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/.svn/entries 20130413/pki/base/console/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/.svn/entries 20130413/pki/base/console/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/config/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/config/install/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/config/install/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/connection/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/connection/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/images/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/keycert/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/keycert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/managecert/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/managecert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/menu/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/menu/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/misc/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/misc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/notification/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/notification/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/security/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/security/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/status/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/status/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/task/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/task/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/ug/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/ug/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/admin/certsrv/wizard/.svn/entries 20130413/pki/base/console/src/com/netscape/admin/certsrv/wizard/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/certsrv/.svn/entries 20130413/pki/base/console/src/com/netscape/certsrv/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/src/com/netscape/certsrv/common/.svn/entries 20130413/pki/base/console/src/com/netscape/certsrv/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/console/templates/.svn/entries 20130413/pki/base/console/templates/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/.svn/entries 20130413/pki/base/java-tools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/config/.svn/entries 20130413/pki/base/java-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/doc/.svn/entries 20130413/pki/base/java-tools/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/src/.svn/entries 20130413/pki/base/java-tools/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/src/com/.svn/entries 20130413/pki/base/java-tools/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/src/com/netscape/.svn/entries 20130413/pki/base/java-tools/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/src/com/netscape/cmstools/.svn/entries 20130413/pki/base/java-tools/src/com/netscape/cmstools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/java-tools/templates/.svn/entries 20130413/pki/base/java-tools/templates/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/.svn/entries 20130413/pki/base/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/config/.svn/entries 20130413/pki/base/kra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/doc/.svn/entries 20130413/pki/base/kra/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/setup/.svn/entries 20130413/pki/base/kra/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/.svn/entries 20130413/pki/base/kra/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/alias/.svn/entries 20130413/pki/base/kra/shared/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/conf/.svn/entries 20130413/pki/base/kra/shared/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/etc/.svn/entries 20130413/pki/base/kra/shared/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/etc/init.d/.svn/entries 20130413/pki/base/kra/shared/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/logs/.svn/entries 20130413/pki/base/kra/shared/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/logs/signedAudit/.svn/entries 20130413/pki/base/kra/shared/logs/signedAudit/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/shared/.svn/entries 20130413/pki/base/kra/shared/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/shared/classes/.svn/entries 20130413/pki/base/kra/shared/shared/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/shared/lib/.svn/entries 20130413/pki/base/kra/shared/shared/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/temp/.svn/entries 20130413/pki/base/kra/shared/temp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/.svn/entries 20130413/pki/base/kra/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/ROOT/.svn/entries 20130413/pki/base/kra/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/ROOT/WEB-INF/.svn/entries 20130413/pki/base/kra/shared/webapps/ROOT/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/kra/.svn/entries 20130413/pki/base/kra/shared/webapps/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/kra/WEB-INF/.svn/entries 20130413/pki/base/kra/shared/webapps/kra/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/webapps/kra/WEB-INF/classes/.svn/entries 20130413/pki/base/kra/shared/webapps/kra/WEB-INF/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/shared/work/.svn/entries 20130413/pki/base/kra/shared/work/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/src/.svn/entries 20130413/pki/base/kra/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/src/com/.svn/entries 20130413/pki/base/kra/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/src/com/netscape/.svn/entries 20130413/pki/base/kra/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/kra/src/com/netscape/kra/.svn/entries 20130413/pki/base/kra/src/com/netscape/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/manage/.svn/entries 20130413/pki/base/manage/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/manage/config/.svn/entries 20130413/pki/base/manage/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/.svn/entries 20130413/pki/base/migrate/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-12T02:57:05.580597Z
> 2563
diff -r 20130410/pki/base/migrate/41ToTxt/.svn/entries 20130413/pki/base/migrate/41ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/41ToTxt/classes/.svn/entries 20130413/pki/base/migrate/41ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/41ToTxt/src/.svn/entries 20130413/pki/base/migrate/41ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42SP2ToTxt/.svn/entries 20130413/pki/base/migrate/42SP2ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42SP2ToTxt/classes/.svn/entries 20130413/pki/base/migrate/42SP2ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42SP2ToTxt/src/.svn/entries 20130413/pki/base/migrate/42SP2ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42ToTxt/.svn/entries 20130413/pki/base/migrate/42ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42ToTxt/classes/.svn/entries 20130413/pki/base/migrate/42ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/42ToTxt/src/.svn/entries 20130413/pki/base/migrate/42ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/45ToTxt/.svn/entries 20130413/pki/base/migrate/45ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/45ToTxt/classes/.svn/entries 20130413/pki/base/migrate/45ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/45ToTxt/src/.svn/entries 20130413/pki/base/migrate/45ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/47ToTxt/.svn/entries 20130413/pki/base/migrate/47ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/47ToTxt/classes/.svn/entries 20130413/pki/base/migrate/47ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/47ToTxt/src/.svn/entries 20130413/pki/base/migrate/47ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/60ToTxt/.svn/entries 20130413/pki/base/migrate/60ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/60ToTxt/classes/.svn/entries 20130413/pki/base/migrate/60ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/60ToTxt/src/.svn/entries 20130413/pki/base/migrate/60ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/61ToTxt/.svn/entries 20130413/pki/base/migrate/61ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/61ToTxt/classes/.svn/entries 20130413/pki/base/migrate/61ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/61ToTxt/src/.svn/entries 20130413/pki/base/migrate/61ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/62ToTxt/.svn/entries 20130413/pki/base/migrate/62ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/62ToTxt/classes/.svn/entries 20130413/pki/base/migrate/62ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/62ToTxt/src/.svn/entries 20130413/pki/base/migrate/62ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/63ToTxt/.svn/entries 20130413/pki/base/migrate/63ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/63ToTxt/classes/.svn/entries 20130413/pki/base/migrate/63ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/63ToTxt/src/.svn/entries 20130413/pki/base/migrate/63ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/70ToTxt/.svn/entries 20130413/pki/base/migrate/70ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/70ToTxt/classes/.svn/entries 20130413/pki/base/migrate/70ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/70ToTxt/src/.svn/entries 20130413/pki/base/migrate/70ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/71ToTxt/.svn/entries 20130413/pki/base/migrate/71ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/71ToTxt/classes/.svn/entries 20130413/pki/base/migrate/71ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/71ToTxt/src/.svn/entries 20130413/pki/base/migrate/71ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/72ToTxt/.svn/entries 20130413/pki/base/migrate/72ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/72ToTxt/classes/.svn/entries 20130413/pki/base/migrate/72ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/72ToTxt/src/.svn/entries 20130413/pki/base/migrate/72ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/73ToTxt/.svn/entries 20130413/pki/base/migrate/73ToTxt/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/73ToTxt/classes/.svn/entries 20130413/pki/base/migrate/73ToTxt/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/73ToTxt/src/.svn/entries 20130413/pki/base/migrate/73ToTxt/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/80/.svn/entries 20130413/pki/base/migrate/80/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/80To81/.svn/entries 20130413/pki/base/migrate/80To81/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-12T02:57:05.580597Z
> 2563
35,38c35,38
< 2013-04-04T21:03:31.000000Z
< c5cb756da97e5d913cc47fc4f568d41f
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-11T02:48:26.000000Z
> 49d8850480e9f26ce328bb7cb0c45715
> 2013-04-10T13:40:18.088192Z
> 2555
61c61
< 57530
---
> 60261
103,106c103,106
< 2013-04-04T21:03:31.000000Z
< a09c2edf97cbb9a56d5ce690f1fe014d
< 2013-04-04T19:28:43.276281Z
< 2553
---
> 2013-04-13T02:42:09.000000Z
> 8d69dec9439b162f6ad984efee05c62f
> 2013-04-12T02:57:05.580597Z
> 2563
129c129
< 29765
---
> 31197
diff -r 20130410/pki/base/migrate/80To81/.svn/text-base/common.pm.svn-base 20130413/pki/base/migrate/80To81/.svn/text-base/common.pm.svn-base
6d5
< use XML::LibXML;
27a27
> update_node_text add_node remove_node
32a33,35
> use Socket;
> use Sys::Hostname;
> use XML::LibXML;
74a78
> my $PKI_PORT_CONFIGURATION_MODE_SLOT = "PKI_PORT_CONFIGURATION_MODE";
103a108,112
> my $PKI_AGENT_MACHINE_IP_ADDR_SLOT = "PKI_AGENT_MACHINE_IP_ADDR";
> my $PKI_EE_MACHINE_IP_ADDR_SLOT = "PKI_EE_MACHINE_IP_ADDR";
> my $PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR_SLOT = "PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR";
> my $PKI_ADMIN_MACHINE_IP_ADDR_SLOT = "PKI_ADMIN_MACHINE_IP_ADDR";
> my $PKI_AGENT_MACHINE_NAME_SLOT = "PKI_AGENT_MACHINE_NAME";
149a159,165
> my $is_IPv6 = 0;
>
> if( defined( $ENV{ 'PKI_HOSTNAME' } ) ) {
> # IPv6: Retrieve hostname from environment variable
> $is_IPv6 = 1;
> }
>
428a445,466
> # arg0 hostname
> # return "4-tuple" IP address (IPv4), or pass-through hostname (IPv6)
> sub get_IP_address_from_FQDN
> {
> my $addr = "";
> if( !$is_IPv6 ) {
> if( $_[0] !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/ ) {
> # Retrieve IP address from a "mnemonic" hostname
> ( $addr ) = inet_ntoa( ( gethostbyname( $_[0] ) )[4] );
> } else {
> # Simply return passed-in "4-tuple" IP address
> $addr = $_[0];
> }
> } else {
> # IPv6: Don't rely upon "Socket6.pm" being present!
> $addr = $_[0];
> }
>
> return( $addr );
> }
>
>
628a667,691
> #ip addresses
> my $agent_ip_addr = get_IP_address_from_FQDN($agentMachineName);
> my $ee_ip_addr = get_IP_address_from_FQDN($eeMachineName);
> my $ee_client_auth_ip_addr = get_IP_address_from_FQDN($eecaMachineName);
> my $admin_ip_addr = get_IP_address_from_FQDN($adminMachineName);
>
> # port configuration mode
> my $port_configuration_mode = "";
> if (exists $cfg->{'service.portConfigurationMode'} and \
> defined $cfg->{'service.portConfigurationMode'}) {
> $port_configuration_mode = $cfg->{'service.portConfigurationMode'};
> } else {
> if ($subsystem_type eq $RA) {
> $port_configuration_mode = "RA Ports";
> } elsif ($subsystem_type eq $TPS) {
> $port_configuration_mode = "TPS Ports";
> } elsif (($secure_port == $ee_secure_port) &&
> ($secure_port == $admin_secure_port) &&
> ($secure_port == $agent_secure_port)) {
> $port_configuration_mode = "Shared Ports";
> } else {
> $port_configuration_mode = "Port Separation";
> }
> }
>
707,710c770
< $slot_hash{$PKI_AGENT_MACHINE_NAME} = $agentMachineName;
< $slot_hash{$PKI_EE_MACHINE_NAME} = $eeMachineName;
< $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_NAME} = $eecaMachineName;
< $slot_hash{$PKI_ADMIN_MACHINE_NAME} = $adminMachineName;
---
> $slot_hash{$PKI_PORT_CONFIGURATION_MODE_SLOT} = $port_configuration_mode;
746a807,815
> $slot_hash{$PKI_AGENT_MACHINE_NAME} = $agentMachineName;
> $slot_hash{$PKI_EE_MACHINE_NAME} = $eeMachineName;
> $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_NAME} = $eecaMachineName;
> $slot_hash{$PKI_ADMIN_MACHINE_NAME} = $adminMachineName;
> $slot_hash{$PKI_AGENT_MACHINE_IP_ADDR_SLOT} = $agent_ip_addr;
> $slot_hash{$PKI_EE_MACHINE_IP_ADDR_SLOT} = $ee_ip_addr;
> $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR_SLOT} = $ee_client_auth_ip_addr;
> $slot_hash{$PKI_ADMIN_MACHINE_IP_ADDR_SLOT} = $admin_ip_addr;
> $slot_hash{$PKI_PORT_CONFIGURATION_MODE_SLOT} = $port_configuration_mode;
diff -r 20130410/pki/base/migrate/80To81/.svn/text-base/upgrade_config.pl.svn-base 20130413/pki/base/migrate/80To81/.svn/text-base/upgrade_config.pl.svn-base
112a113,140
> my $tokenAuthenticateServletData =
> "<servlet>
> <servlet-name> caTokenAuthenticate-admin </servlet-name>
> <servlet-class> com.netscape.cms.servlet.csadmin.TokenAuthenticate </servlet-class>
> <init-param>
> <param-name> GetClientCert </param-name>
> <param-value> false </param-value>
> </init-param>
> <init-param>
> <param-name> authority </param-name>
> <param-value> ca </param-value>
> </init-param>
> <init-param>
> <param-name> ID </param-name>
> <param-value> caTokenAuthenticate </param-value>
> </init-param>
> <init-param>
> <param-name> interface </param-name>
> <param-value> admin </param-value>
> </init-param>
> </servlet>";
>
> my $tokenAuthenticateMappingData =
> "<servlet-mapping>
> <servlet-name> caTokenAuthenticate-admin </servlet-name>
> <url-pattern> /admin/ca/tokenAuthenticate </url-pattern>
> </servlet-mapping>";
>
508a537,545
>
> #add caTokenAuthenticate-admin
> $q = "//servlet[normalize-space(servlet-name) = 'caTokenAuthenticate-admin']";
> &add_node($doc, $parser, $q, $top_path, $tokenAuthenticateServletData);
>
> #add caTokenAuthenticate-admin servlet mapping
> $q = "//servlet-mapping[normalize-space(servlet-name) = " .
> "'caTokenAuthenticate-admin']";
> &add_node($doc,$parser, $q, $top_path, $tokenAuthenticateMappingData);
diff -r 20130410/pki/base/migrate/80To81/classes/.svn/entries 20130413/pki/base/migrate/80To81/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/80To81/common.pm 20130413/pki/base/migrate/80To81/common.pm
6d5
< use XML::LibXML;
27a27
> update_node_text add_node remove_node
32a33,35
> use Socket;
> use Sys::Hostname;
> use XML::LibXML;
74a78
> my $PKI_PORT_CONFIGURATION_MODE_SLOT = "PKI_PORT_CONFIGURATION_MODE";
103a108,112
> my $PKI_AGENT_MACHINE_IP_ADDR_SLOT = "PKI_AGENT_MACHINE_IP_ADDR";
> my $PKI_EE_MACHINE_IP_ADDR_SLOT = "PKI_EE_MACHINE_IP_ADDR";
> my $PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR_SLOT = "PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR";
> my $PKI_ADMIN_MACHINE_IP_ADDR_SLOT = "PKI_ADMIN_MACHINE_IP_ADDR";
> my $PKI_AGENT_MACHINE_NAME_SLOT = "PKI_AGENT_MACHINE_NAME";
149a159,165
> my $is_IPv6 = 0;
>
> if( defined( $ENV{ 'PKI_HOSTNAME' } ) ) {
> # IPv6: Retrieve hostname from environment variable
> $is_IPv6 = 1;
> }
>
428a445,466
> # arg0 hostname
> # return "4-tuple" IP address (IPv4), or pass-through hostname (IPv6)
> sub get_IP_address_from_FQDN
> {
> my $addr = "";
> if( !$is_IPv6 ) {
> if( $_[0] !~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)$/ ) {
> # Retrieve IP address from a "mnemonic" hostname
> ( $addr ) = inet_ntoa( ( gethostbyname( $_[0] ) )[4] );
> } else {
> # Simply return passed-in "4-tuple" IP address
> $addr = $_[0];
> }
> } else {
> # IPv6: Don't rely upon "Socket6.pm" being present!
> $addr = $_[0];
> }
>
> return( $addr );
> }
>
>
628a667,691
> #ip addresses
> my $agent_ip_addr = get_IP_address_from_FQDN($agentMachineName);
> my $ee_ip_addr = get_IP_address_from_FQDN($eeMachineName);
> my $ee_client_auth_ip_addr = get_IP_address_from_FQDN($eecaMachineName);
> my $admin_ip_addr = get_IP_address_from_FQDN($adminMachineName);
>
> # port configuration mode
> my $port_configuration_mode = "";
> if (exists $cfg->{'service.portConfigurationMode'} and \
> defined $cfg->{'service.portConfigurationMode'}) {
> $port_configuration_mode = $cfg->{'service.portConfigurationMode'};
> } else {
> if ($subsystem_type eq $RA) {
> $port_configuration_mode = "RA Ports";
> } elsif ($subsystem_type eq $TPS) {
> $port_configuration_mode = "TPS Ports";
> } elsif (($secure_port == $ee_secure_port) &&
> ($secure_port == $admin_secure_port) &&
> ($secure_port == $agent_secure_port)) {
> $port_configuration_mode = "Shared Ports";
> } else {
> $port_configuration_mode = "Port Separation";
> }
> }
>
707,710c770
< $slot_hash{$PKI_AGENT_MACHINE_NAME} = $agentMachineName;
< $slot_hash{$PKI_EE_MACHINE_NAME} = $eeMachineName;
< $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_NAME} = $eecaMachineName;
< $slot_hash{$PKI_ADMIN_MACHINE_NAME} = $adminMachineName;
---
> $slot_hash{$PKI_PORT_CONFIGURATION_MODE_SLOT} = $port_configuration_mode;
746a807,815
> $slot_hash{$PKI_AGENT_MACHINE_NAME} = $agentMachineName;
> $slot_hash{$PKI_EE_MACHINE_NAME} = $eeMachineName;
> $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_NAME} = $eecaMachineName;
> $slot_hash{$PKI_ADMIN_MACHINE_NAME} = $adminMachineName;
> $slot_hash{$PKI_AGENT_MACHINE_IP_ADDR_SLOT} = $agent_ip_addr;
> $slot_hash{$PKI_EE_MACHINE_IP_ADDR_SLOT} = $ee_ip_addr;
> $slot_hash{$PKI_EE_CLIENT_AUTH_MACHINE_IP_ADDR_SLOT} = $ee_client_auth_ip_addr;
> $slot_hash{$PKI_ADMIN_MACHINE_IP_ADDR_SLOT} = $admin_ip_addr;
> $slot_hash{$PKI_PORT_CONFIGURATION_MODE_SLOT} = $port_configuration_mode;
diff -r 20130410/pki/base/migrate/80To81/src/.svn/entries 20130413/pki/base/migrate/80To81/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/80To81/upgrade_config.pl 20130413/pki/base/migrate/80To81/upgrade_config.pl
112a113,140
> my $tokenAuthenticateServletData =
> "<servlet>
> <servlet-name> caTokenAuthenticate-admin </servlet-name>
> <servlet-class> com.netscape.cms.servlet.csadmin.TokenAuthenticate </servlet-class>
> <init-param>
> <param-name> GetClientCert </param-name>
> <param-value> false </param-value>
> </init-param>
> <init-param>
> <param-name> authority </param-name>
> <param-value> ca </param-value>
> </init-param>
> <init-param>
> <param-name> ID </param-name>
> <param-value> caTokenAuthenticate </param-value>
> </init-param>
> <init-param>
> <param-name> interface </param-name>
> <param-value> admin </param-value>
> </init-param>
> </servlet>";
>
> my $tokenAuthenticateMappingData =
> "<servlet-mapping>
> <servlet-name> caTokenAuthenticate-admin </servlet-name>
> <url-pattern> /admin/ca/tokenAuthenticate </url-pattern>
> </servlet-mapping>";
>
508a537,545
>
> #add caTokenAuthenticate-admin
> $q = "//servlet[normalize-space(servlet-name) = 'caTokenAuthenticate-admin']";
> &add_node($doc, $parser, $q, $top_path, $tokenAuthenticateServletData);
>
> #add caTokenAuthenticate-admin servlet mapping
> $q = "//servlet-mapping[normalize-space(servlet-name) = " .
> "'caTokenAuthenticate-admin']";
> &add_node($doc,$parser, $q, $top_path, $tokenAuthenticateMappingData);
diff -r 20130410/pki/base/migrate/TpsTo80/.svn/entries 20130413/pki/base/migrate/TpsTo80/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TpsTo80/linux/.svn/entries 20130413/pki/base/migrate/TpsTo80/linux/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TpsTo80/solaris/.svn/entries 20130413/pki/base/migrate/TpsTo80/solaris/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo60/.svn/entries 20130413/pki/base/migrate/TxtTo60/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo60/classes/.svn/entries 20130413/pki/base/migrate/TxtTo60/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo60/src/.svn/entries 20130413/pki/base/migrate/TxtTo60/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo61/.svn/entries 20130413/pki/base/migrate/TxtTo61/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo61/classes/.svn/entries 20130413/pki/base/migrate/TxtTo61/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo61/src/.svn/entries 20130413/pki/base/migrate/TxtTo61/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo62/.svn/entries 20130413/pki/base/migrate/TxtTo62/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo62/classes/.svn/entries 20130413/pki/base/migrate/TxtTo62/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo62/src/.svn/entries 20130413/pki/base/migrate/TxtTo62/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo70/.svn/entries 20130413/pki/base/migrate/TxtTo70/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo70/classes/.svn/entries 20130413/pki/base/migrate/TxtTo70/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo70/src/.svn/entries 20130413/pki/base/migrate/TxtTo70/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo71/.svn/entries 20130413/pki/base/migrate/TxtTo71/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo71/classes/.svn/entries 20130413/pki/base/migrate/TxtTo71/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo71/src/.svn/entries 20130413/pki/base/migrate/TxtTo71/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo72/.svn/entries 20130413/pki/base/migrate/TxtTo72/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo72/classes/.svn/entries 20130413/pki/base/migrate/TxtTo72/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo72/src/.svn/entries 20130413/pki/base/migrate/TxtTo72/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo73/.svn/entries 20130413/pki/base/migrate/TxtTo73/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo73/classes/.svn/entries 20130413/pki/base/migrate/TxtTo73/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo73/src/.svn/entries 20130413/pki/base/migrate/TxtTo73/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo80/.svn/entries 20130413/pki/base/migrate/TxtTo80/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo80/classes/.svn/entries 20130413/pki/base/migrate/TxtTo80/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/TxtTo80/src/.svn/entries 20130413/pki/base/migrate/TxtTo80/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/config/.svn/entries 20130413/pki/base/migrate/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/migrate/kra/.svn/entries 20130413/pki/base/migrate/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/.svn/entries 20130413/pki/base/native-tools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/config/.svn/entries 20130413/pki/base/native-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/doc/.svn/entries 20130413/pki/base/native-tools/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/m4/.svn/entries 20130413/pki/base/native-tools/m4/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/.svn/entries 20130413/pki/base/native-tools/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/bulkissuance/.svn/entries 20130413/pki/base/native-tools/src/bulkissuance/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/p7tool/.svn/entries 20130413/pki/base/native-tools/src/p7tool/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/revoker/.svn/entries 20130413/pki/base/native-tools/src/revoker/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/setpin/.svn/entries 20130413/pki/base/native-tools/src/setpin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/sslget/.svn/entries 20130413/pki/base/native-tools/src/sslget/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/src/tkstool/.svn/entries 20130413/pki/base/native-tools/src/tkstool/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/templates/.svn/entries 20130413/pki/base/native-tools/templates/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/native-tools/wrappers/.svn/entries 20130413/pki/base/native-tools/wrappers/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/.svn/entries 20130413/pki/base/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/config/.svn/entries 20130413/pki/base/ocsp/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/doc/.svn/entries 20130413/pki/base/ocsp/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/setup/.svn/entries 20130413/pki/base/ocsp/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/.svn/entries 20130413/pki/base/ocsp/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/alias/.svn/entries 20130413/pki/base/ocsp/shared/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/conf/.svn/entries 20130413/pki/base/ocsp/shared/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/etc/.svn/entries 20130413/pki/base/ocsp/shared/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/etc/init.d/.svn/entries 20130413/pki/base/ocsp/shared/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/logs/.svn/entries 20130413/pki/base/ocsp/shared/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/logs/signedAudit/.svn/entries 20130413/pki/base/ocsp/shared/logs/signedAudit/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/shared/.svn/entries 20130413/pki/base/ocsp/shared/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/shared/classes/.svn/entries 20130413/pki/base/ocsp/shared/shared/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/shared/lib/.svn/entries 20130413/pki/base/ocsp/shared/shared/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/temp/.svn/entries 20130413/pki/base/ocsp/shared/temp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/.svn/entries 20130413/pki/base/ocsp/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/ROOT/.svn/entries 20130413/pki/base/ocsp/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/ROOT/WEB-INF/.svn/entries 20130413/pki/base/ocsp/shared/webapps/ROOT/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/ocsp/.svn/entries 20130413/pki/base/ocsp/shared/webapps/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/.svn/entries 20130413/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/classes/.svn/entries 20130413/pki/base/ocsp/shared/webapps/ocsp/WEB-INF/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/shared/work/.svn/entries 20130413/pki/base/ocsp/shared/work/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/src/.svn/entries 20130413/pki/base/ocsp/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/src/com/.svn/entries 20130413/pki/base/ocsp/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/src/com/netscape/.svn/entries 20130413/pki/base/ocsp/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ocsp/src/com/netscape/ocsp/.svn/entries 20130413/pki/base/ocsp/src/com/netscape/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/.svn/entries 20130413/pki/base/osutil/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/config/.svn/entries 20130413/pki/base/osutil/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/m4/.svn/entries 20130413/pki/base/osutil/m4/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/src/.svn/entries 20130413/pki/base/osutil/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/src/com/.svn/entries 20130413/pki/base/osutil/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/src/com/netscape/.svn/entries 20130413/pki/base/osutil/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/osutil/src/com/netscape/osutil/.svn/entries 20130413/pki/base/osutil/src/com/netscape/osutil/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/.svn/entries 20130413/pki/base/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/alias/.svn/entries 20130413/pki/base/ra/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/apache/.svn/entries 20130413/pki/base/ra/apache/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/apache/conf/.svn/entries 20130413/pki/base/ra/apache/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/config/.svn/entries 20130413/pki/base/ra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/doc/.svn/entries 20130413/pki/base/ra/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/emails/.svn/entries 20130413/pki/base/ra/emails/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/etc/.svn/entries 20130413/pki/base/ra/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/etc/init.d/.svn/entries 20130413/pki/base/ra/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/.svn/entries 20130413/pki/base/ra/forms/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/admin/.svn/entries 20130413/pki/base/ra/forms/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/admin/group/.svn/entries 20130413/pki/base/ra/forms/admin/group/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/admin/user/.svn/entries 20130413/pki/base/ra/forms/admin/user/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/agent/.svn/entries 20130413/pki/base/ra/forms/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/agent/cert/.svn/entries 20130413/pki/base/ra/forms/agent/cert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/agent/request/.svn/entries 20130413/pki/base/ra/forms/agent/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/.svn/entries 20130413/pki/base/ra/forms/ee/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/agent/.svn/entries 20130413/pki/base/ra/forms/ee/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/request/.svn/entries 20130413/pki/base/ra/forms/ee/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/scep/.svn/entries 20130413/pki/base/ra/forms/ee/scep/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/server/.svn/entries 20130413/pki/base/ra/forms/ee/server/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/forms/ee/user/.svn/entries 20130413/pki/base/ra/forms/ee/user/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/.svn/entries 20130413/pki/base/ra/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/.svn/entries 20130413/pki/base/ra/lib/perl/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/Base/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/Base/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/Conn/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/Conn/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/RA/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/RA/.svn/entries
4c4
< 2554
---
> 2564
204,205c204,205
<
< 2013-01-28T19:58:58.000000Z
---
> delete
> 2013-04-13T01:26:02.000000Z
1054,1055c1054,1055
<
< 2013-01-28T19:58:59.000000Z
---
> delete
> 2013-04-13T01:26:02.000000Z
diff -r 20130410/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm 20130413/pki/base/ra/lib/perl/PKI/RA/CAInfoPanel.pm
80c80,84
< my $count = $q->param('urls');
---
> my $count = defined($q->param('urls')) ? $q->param('urls') : "";
> if ($count eq "") {
> $::symbol{errorString} = "No CA information provided. CA must be installed prior to RA installation";
> return 0;
> }
86c90,92
< my $host = "";
---
> my $ca_ee_host = "";
> my $ca_agent_host = "";
> my $ca_admin_host = "";
92a99,104
> # this is for pkisilent
> &PKI::RA::Wizard::debug_log("CAInfoPanel: update - It is believed "
> . "that 'pkisilent' no longer utilizes "
> . "this code path, so this message "
> . "should not appear in the log!");
>
94,96c106,118
< $host = $info->host;
< $https_ee_port = $info->port;
< $domain_xml = get_domain_xml($host, $https_ee_port);
---
> $ca_ee_host = defined($info->host) ? $info->host : "";
> if ($ca_ee_host eq "") {
> $::symbol{errorString} = "No CA EE host provided.";
> return 0;
> }
>
> $https_ee_port = defined($info->port) ? $info->port : "";
> if ($https_ee_port eq "") {
> $::symbol{errorString} = "No CA EE port provided.";
> return 0;
> }
>
> $domain_xml = get_domain_xml($ca_ee_host, $https_ee_port);
102,106c124,131
< $https_agent_port = get_secure_agent_port_from_domain_xml($domain_xml, $host, $https_ee_port);
< $https_admin_port = get_secure_admin_port_from_domain_xml($domain_xml, $host, $https_ee_port);
<
< if(($https_admin_port eq "") || ($https_agent_port eq "")) {
< $::symbol{errorString} = "missing secure CA admin or agent port. CA must be installed prior to RA installation";
---
> $ca_agent_host = get_agent_host_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $https_agent_port = get_secure_agent_port_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $ca_admin_host = get_admin_host_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $https_admin_port = get_secure_admin_port_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
>
> if(($ca_admin_host eq "") || ($https_admin_port eq "") ||
> ($ca_agent_host eq "") || ($https_agent_port eq "")) {
> $::symbol{errorString} = "missing secure CA admin or agent host/port information not provided by security domain. CA must be installed prior to RA installation";
110,113c135,149
< $host = $::config->get("preop.securitydomain.ca$count.host");
< $https_ee_port = $::config->get("preop.securitydomain.ca$count.secureport");
< $https_agent_port = $::config->get("preop.securitydomain.ca$count.secureagentport");
< $https_admin_port = $::config->get("preop.securitydomain.ca$count.secureadminport");
---
> &PKI::RA::Wizard::debug_log("CAInfoPanel: update - "
> . "Obtaining CA Info from 'CS.cfg'.");
>
> $ca_ee_host = defined($::config->get("preop.securitydomain.ca$count.eehost")) ?
> $::config->get("preop.securitydomain.ca$count.eehost") : "";
> $https_ee_port = defined($::config->get("preop.securitydomain.ca$count.secureport")) ?
> $::config->get("preop.securitydomain.ca$count.secureport") : "";
> $ca_agent_host = defined($::config->get("preop.securitydomain.ca$count.agenthost")) ?
> $::config->get("preop.securitydomain.ca$count.agenthost") : "";
> $https_agent_port = defined($::config->get("preop.securitydomain.ca$count.secureagentport")) ?
> $::config->get("preop.securitydomain.ca$count.secureagentport") : "";
> $ca_admin_host = defined($::config->get("preop.securitydomain.ca$count.adminhost")) ?
> $::config->get("preop.securitydomain.ca$count.adminhost") : "";
> $https_admin_port = defined($::config->get("preop.securitydomain.ca$count.secureadminport")) ?
> $::config->get("preop.securitydomain.ca$count.secureadminport") : "";
116c152,154
< if (($host eq "") || ($https_ee_port eq "") || ($https_admin_port eq "") || ($https_agent_port eq "")) {
---
> if (($ca_ee_host eq "") || ($https_ee_port eq "") ||
> ($ca_agent_host eq "") || ($https_agent_port eq "") ||
> ($ca_admin_host eq "") || ($https_admin_port eq "")) {
121c159
< &PKI::RA::Wizard::debug_log("CAInfoPanel: update - host= $host, https_ee_port= $https_ee_port");
---
> &PKI::RA::Wizard::debug_log("CAInfoPanel: update - ca_ee_host= $ca_ee_host, https_ee_port= $https_ee_port");
123c161
< $::config->put("preop.cainfo.select", "https://$host:$https_admin_port");
---
> $::config->put("preop.cainfo.select", "https://$ca_admin_host:$https_admin_port");
128,130c166,168
< $::config->put("conn.ca1.hostport", $host . ":" . $https_ee_port);
< $::config->put("conn.ca1.hostagentport", $host . ":" . $https_agent_port);
< $::config->put("conn.ca1.hostadminport", $host . ":" . $https_admin_port);
---
> $::config->put("conn.ca1.hostport", $ca_ee_host . ":" . $https_ee_port);
> $::config->put("conn.ca1.hostagentport", $ca_agent_host . ":" . $https_agent_port);
> $::config->put("conn.ca1.hostadminport", $ca_admin_host . ":" . $https_admin_port);
140c178
< system("/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$serverCertNickName\" -r \"/ca/ee/ca/getCertChain\" $host:$https_ee_port > $tmpfile");
---
> system("/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$serverCertNickName\" -r \"/ca/ee/ca/getCertChain\" $ca_ee_host:$https_ee_port > $tmpfile");
170a209,211
> $::config->put("preop.cainfo.done", "true");
> $::config->commit();
>
185,186c226,228
< my $host = $::config->get("preop.securitydomain.ca$count.host");
< if ($host eq "") {
---
> my $ca_ee_host = "";
> $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost");
> if ($ca_ee_host eq "") {
191,192c233,234
< my $item = $name . " - https://" . $host . ":" . $https_ee_port;
< # my $item = "https://" . $host . ":" . $https_ee_port;
---
> my $item = $name . " - https://" . $ca_ee_host . ":" . $https_ee_port;
> # my $item = "https://" . $ca_ee_host . ":" . $https_ee_port;
208c250
< $::symbol{errorString} = "no CA found. CA, TKS, and optionally DRM must be installed prior to RA installation";
---
> $::symbol{errorString} = "no CA found. CA must be installed prior to RA installation";
216c258
< my $host = $1;
---
> my $ca_ee_host = $1;
240c282
< my $host = $2;
---
> my $ca_ee_host = $2;
244c286
< # to the selected host and secure ee port.
---
> # to the selected EE host and secure ee port.
252c294
< if( ( $host eq $c->{'Host'}[0] ) &&
---
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
266c308
< my $host = $2;
---
> my $ca_ee_host = $2;
270c312
< # to the selected host and secure ee port.
---
> # to the selected EE host and secure ee port.
278c320
< if( ( $host eq $c->{'Host'}[0] ) &&
---
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
288a331,400
> sub get_admin_host_from_domain_xml
> {
> my $content = $1;
> my $ca_ee_host = $2;
> my $https_ee_port = $3;
>
> # Retrieve the admin host corresponding
> # to the selected EE host and secure ee port.
> my $parser = XML::Simple->new();
> my $response = $parser->XMLin($content);
> my $xml = $parser->XMLin( $response->{'DomainInfo'},
> ForceArray => 1 );
> my $ca_admin_host = "";
> my $count = 0;
> foreach my $c (@{$xml->{'CAList'}[0]->{'CA'}}) {
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
> ( $https_ee_port eq $c->{'SecurePort'}[0] ) ) {
> if( $c->{'AdminHost'}[0] ne "" ) {
> # IP Port Separation Schema
> $ca_admin_host = https_$c->{'AdminHost'}[0];
> } else {
> # Port Separation Schema
> $ca_admin_host = https_$c->{'Host'}[0];
> }
> }
>
> $count++;
> }
>
> return $ca_admin_host;
> }
>
> sub get_agent_host_from_domain_xml
> {
> my $content = $1;
> my $ca_ee_host = $2;
> my $https_ee_port = $3;
>
> # Retrieve the agent host corresponding
> # to the selected EE host and secure ee port.
> my $parser = XML::Simple->new();
> my $response = $parser->XMLin($content);
> my $xml = $parser->XMLin( $response->{'DomainInfo'},
> ForceArray => 1 );
> my $ca_agent_host = "";
> my $count = 0;
> foreach my $c (@{$xml->{'CAList'}[0]->{'CA'}}) {
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
> ( $https_ee_port eq $c->{'SecurePort'}[0] ) ) {
> if( $c->{'AgentHost'}[0] ne "" ) {
> # IP Port Separation Schema
> $ca_agent_host = https_$c->{'AgentHost'}[0];
> } else {
> # Port Separation Schema
> $ca_agent_host = https_$c->{'Host'}[0];
> }
> }
>
> $count++;
> }
>
> return $ca_agent_host;
> }
>
> sub is_panel_done
> {
> return $::config->get("preop.cainfo.done");
> }
>
>
Only in 20130410/pki/base/ra/lib/perl/PKI/RA: DRMInfoPanel.pm
diff -r 20130410/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm 20130413/pki/base/ra/lib/perl/PKI/RA/DisplayCertChainPanel.pm
124a125,126
> $::config->put("preop.displaycertchain.done", "true");
> $::config->commit();
253,255c255,261
< $c->{'EEClientAuthPort'}[0]);
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> $c->{'SecureEEClientAuthPort'}[0]);
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
> my $ca_agent_hostname = "";
> my $ca_ee_hostname = "";
> my $ca_admin_hostname = "";
> my $ca_eeca_hostname = "";
258a265
> $ca_agent_hostname = $c->{'AgentHost'}[0];
261a269
> $ca_agent_hostname = $c->{'Host'}[0];
265a274
> $ca_ee_hostname = $c->{'EEHost'}[0];
268a278
> $ca_ee_hostname = $c->{'Host'}[0];
272a283
> $ca_admin_hostname = $c->{'AdminHost'}[0];
275a287
> $ca_admin_hostname = $c->{'Host'}[0];
279a292
> $ca_eeca_hostname = $c->{'EEClientAuthHost'}[0];
282a296
> $ca_eeca_hostname = $c->{'Host'}[0];
289,290c303
< if( ( $sd_host eq $c-> $::config->put("preop.securitydomain.ca" .
< $count . ".adminhost") ) &&
---
> if( ( $sd_host eq $ca_admin_hostname ) &&
293,310c306,311
< my $http_ee_port = "http://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eehost")
< . ":"
< . $c->{'UnSecurePort'}[0];
< my $https_agent_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".agenthost")
< . ":"
< . $c->{'SecureAgentPort'}[0];
< my $https_ee_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eehost")
< . ":"
< . $c->{'SecurePort'}[0];
< my $https_eeca_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eecahost")
---
> my $http_ee_url = "http://"
> . $ca_ee_hostname
> . ":"
> . $c->{'UnSecurePort'}[0];
> my $https_agent_url = "https://"
> . $ca_agent_hostname
312c313,321
< . $c->{'EEClientAuthPort'}[0];
---
> . $c->{'SecureAgentPort'}[0];
> my $https_ee_url = "https://"
> . $ca_ee_hostname
> . ":"
> . $c->{'SecurePort'}[0];
> my $https_eeca_url = "https://"
> . $ca_eeca_hostname
> . ":"
> . $c->{'SecureEEClientAuthPort'}[0];
315,318c324,327
< $::config->put( "config.sdomainHttpURL", $http_ee_port );
< $::config->put( "config.sdomainAgentURL", $https_agent_port );
< $::config->put( "config.sdomainEEURL", $https_ee_port );
< $::config->put( "config.sdomainEECAURL", $https_eeca_port );
---
> $::config->put( "config.sdomainHttpURL", $http_ee_url );
> $::config->put( "config.sdomainAgentURL", $https_agent_url );
> $::config->put( "config.sdomainEEURL", $https_ee_url );
> $::config->put( "config.sdomainEECAURL", $https_eeca_url );
327c336
< $::config->put( "securitydomain.eehost",
---
> $::config->put( "securitydomain.eecahost",
334c343
< $::config->put( "securitydomain.httpseeport",
---
> $::config->put( "securitydomain.httpseeport",
335a345,346
> $::config->put( "securitydomain.httpseecaport",
> $c->{'SecureEEClientAuthPort'}[0] );
355,356c366,367
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
395,396c406,407
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
439a451,456
> sub is_panel_done
> {
> return $::config->get("preop.displaycertchain.done");
> }
>
>
diff -r 20130410/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm 20130413/pki/base/ra/lib/perl/PKI/RA/NamePanel.pm
89c89
< my $host = "";
---
> my $ca_ee_host = "";
95c95
< $host = $info->host;
---
> $ca_ee_host = $info->host;
98,99c98,99
< $host = $::config->get("preop.securitydomain.ca$count.host");
< if ($host eq "") {
---
> $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost");
> if ($ca_ee_host eq "") {
103c103
< &PKI::RA::Wizard::debug_log("NamePanel: update - host= $host, https_ee_port= $https_ee_port");
---
> &PKI::RA::Wizard::debug_log("NamePanel: update - ca_ee_host= $ca_ee_host, https_ee_port= $https_ee_port");
108c108
< $::config->put("preop.ca.url", "https://" . $host . ":" . $https_ee_port);
---
> $::config->put("preop.ca.url", "https://" . $ca_ee_host . ":" . $https_ee_port);
295c295
< $host = $sdom_url->host;
---
> $ca_ee_host = $sdom_url->host;
299,300c299,300
< $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$token_pwd\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
< $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
---
> $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$token_pwd\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
> $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
302,303c302,303
< $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
< $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
---
> $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
> $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
482,483c482,483
< my $host = $::config->get("preop.securitydomain.ca$count.host");
< if ($host eq "") {
---
> my $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost");
> if ($ca_ee_host eq "") {
488c488
< my $item = $name . " - https://" . $host . ":" . $https_ee_port;
---
> my $item = $name . " - https://" . $ca_ee_host . ":" . $https_ee_port;
Only in 20130410/pki/base/ra/lib/perl/PKI/RA: TKSInfoPanel.pm
diff -r 20130410/pki/base/ra/lib/perl/PKI/Request/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/Request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/Request/Plugin/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/Request/Plugin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/PKI/Service/.svn/entries 20130413/pki/base/ra/lib/perl/PKI/Service/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/lib/perl/Template/.svn/entries 20130413/pki/base/ra/lib/perl/Template/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/logs/.svn/entries 20130413/pki/base/ra/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/scripts/.svn/entries 20130413/pki/base/ra/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/ra/setup/.svn/entries 20130413/pki/base/ra/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/scripts/.svn/entries 20130413/pki/base/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/selinux/.svn/entries 20130413/pki/base/selinux/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/selinux/config/.svn/entries 20130413/pki/base/selinux/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/selinux/src/.svn/entries 20130413/pki/base/selinux/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/setup/.svn/entries 20130413/pki/base/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/setup/config/.svn/entries 20130413/pki/base/setup/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/setup/pkicommon 20130413/pki/base/setup/pkicommon
225c225,235
< $PKI_UNKNOWN_PORT_MODE = "Unknown Port Mode";
---
> $PKI_MISSING_PORT_MODE = "Must be shared ports, separated ports, OR IP separated ports!";
> $PKI_SHARED_AND_IP_SEPARATED_PORT_MODES = "Cannot be shared ports AND IP separated ports!";
> $PKI_SHARED_AND_SEPARATED_PORT_MODES = "Cannot be shared ports AND separated ports!";
> $PKI_DUPLICATE_SHARED_CONNECTOR_PORTS = "Specified shared connector ports must be unique!";
> $PKI_DUPLICATE_SEPARATED_CONNECTOR_PORTS = "Specified separated connector ports must be unique!";
> $PKI_DUPLICATE_IP_SEPARATED_CONNECTOR_PORTS = "For IP separated connector ports, specified secure ports must be unique from the specified unsecure port which must be unique from the specified tomcat port!";
> $PKI_MISSING_HOSTNAMES = "For IP separated ports, ALL hostnames must be specified!";
> $PKI_MISSING_EE_CLIENT_AUTH_HOSTNAME = "When using IP separated ports on a CA, an EE client auth hostname must be specified!";
> $PKI_IP_DUPLICATE_HOSTNAME_PORT = "For IP separated ports, all 'hostname:port' combinations must be unique!";
> $PKI_DUPLICATE_RA_CONNECTOR_PORTS = "Specified RA connector ports must be unique!";
> $PKI_DUPLICATE_TPS_CONNECTOR_PORTS = "Specified TPS connector ports must be unique!";
718,723c728,730
< # return $PKI_IP_PORT_SEPARATION_MODE
< # return $PKI_PORT_SEPARATION_MODE
< # return $PKI_SHARED_PORTS_MODE
< # return $RA_PORTS_MODE
< # return $TPS_PORTS_MODE
< # return $PKI_UNKNOWN_PORT_MODE
---
> # return $PKI_IP_PORT_SEPARATION_MODE, $PKI_PORT_SEPARATION_MODE,
> # $PKI_SHARED_PORTS_MODE, $RA_PORTS_MODE, $TPS_PORTS_MODE, or
> # explanatory error message
726,731c733,738
< my $l_agent_uri = "";
< my $l_ee_uri = "";
< my $l_ee_client_auth_uri = "";
< my $l_admin_uri = "";
< my $l_unsecure_uri = "";
< my $l_tomcat_uri = "";
---
> my $l_agent_hostport = "";
> my $l_ee_hostport = "";
> my $l_ee_client_auth_hostport = "";
> my $l_admin_hostport = "";
> my $l_unsecure_hostport = "";
> my $l_tomcat_hostport = "";
753c760
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_MISSING_PORT_MODE;
761c768
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_SHARED_AND_IP_SEPARATED_PORT_MODES;
765c772
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_SHARED_AND_IP_SEPARATED_PORT_MODES;
771c778
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_SHARED_AND_SEPARATED_PORT_MODES;
780c787
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_DUPLICATE_SHARED_CONNECTOR_PORTS;
808c815
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_DUPLICATE_SEPARATED_CONNECTOR_PORTS;
825c832
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_DUPLICATE_IP_SEPARATED_CONNECTOR_PORTS;
837c844
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_MISSING_HOSTNAMES;
841,846c848,853
< # IP Separated Ports: establish URIs
< $l_agent_uri = $agent_hostname . ':' . $agent_secure_port;
< $l_ee_uri = $ee_hostname . ':' . $ee_secure_port;
< $l_admin_uri = $admin_hostname . ':' . $admin_secure_port;
< $l_unsecure_uri = $ee_hostname . ':' . $unsecure_port;
< $l_tomcat_uri = $admin_hostname . ':' . $tomcat_server_port;
---
> # IP Separated Ports: establish "hostname:port" combinations
> $l_agent_hostport = $agent_hostname . ':' . $agent_secure_port;
> $l_ee_hostport = $ee_hostname . ':' . $ee_secure_port;
> $l_admin_hostport = $admin_hostname . ':' . $admin_secure_port;
> $l_unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
> $l_tomcat_hostport = $admin_hostname . ':' . $tomcat_server_port;
855c862
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_MISSING_EE_CLIENT_AUTH_HOSTNAME;
858,859c865,866
< $l_ee_client_auth_uri = $ee_client_auth_hostname . ':'
< . $ee_client_auth_secure_port;
---
> $l_ee_client_auth_hostport = $ee_client_auth_hostname . ':'
> . $ee_secure_client_auth_port;
861,876c868,884
< # IP Separated Ports: all uri's must be unique
< if( ( $l_agent_uri eq $l_admin_uri ) ||
< ( $l_agent_uri eq $l_ee_uri ) ||
< ( $l_agent_uri eq $l_ee_client_auth_uri ) ||
< ( $l_agent_uri eq $l_unsecure_uri ) ||
< ( $l_agent_uri eq $l_tomcat_uri ) ||
< ( $l_ee_uri eq $l_admin_uri ) ||
< ( $l_ee_uri eq $l_ee_client_auth_uri ) ||
< ( $l_ee_uri eq $l_unsecure_uri ) ||
< ( $l_ee_uri eq $l_tomcat_uri ) ||
< ( $l_ee_client_auth_uri eq $l_admin_uri ) ||
< ( $l_ee_client_auth_uri eq $l_unsecure_uri ) ||
< ( $l_ee_client_auth_uri eq $l_tomcat_uri ) ||
< ( $l_admin_uri eq $l_unsecure_uri ) ||
< ( $l_admin_uri eq $l_tomcat_uri ) ||
< ( $l_unsecure_uri eq $l_tomcat_uri ) ) {
---
> # IP Separated Ports: all "hostname:port" combinations
> # must be unique
> if( ( $l_agent_hostport eq $l_admin_hostport ) ||
> ( $l_agent_hostport eq $l_ee_hostport ) ||
> ( $l_agent_hostport eq $l_ee_client_auth_hostport ) ||
> ( $l_agent_hostport eq $l_unsecure_hostport ) ||
> ( $l_agent_hostport eq $l_tomcat_hostport ) ||
> ( $l_ee_hostport eq $l_admin_hostport ) ||
> ( $l_ee_hostport eq $l_ee_client_auth_hostport ) ||
> ( $l_ee_hostport eq $l_unsecure_hostport ) ||
> ( $l_ee_hostport eq $l_tomcat_hostport ) ||
> ( $l_ee_client_auth_hostport eq $l_admin_hostport ) ||
> ( $l_ee_client_auth_hostport eq $l_unsecure_hostport ) ||
> ( $l_ee_client_auth_hostport eq $l_tomcat_hostport ) ||
> ( $l_admin_hostport eq $l_unsecure_hostport ) ||
> ( $l_admin_hostport eq $l_tomcat_hostport ) ||
> ( $l_unsecure_hostport eq $l_tomcat_hostport ) ) {
878c886
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_IP_DUPLICATE_HOSTNAME_PORT;
886,896c894,905
< # IP Separated Ports: all uri's must be unique
< if( ( $l_agent_uri eq $l_admin_uri ) ||
< ( $l_agent_uri eq $l_ee_uri ) ||
< ( $l_agent_uri eq $l_unsecure_uri ) ||
< ( $l_agent_uri eq $l_tomcat_uri ) ||
< ( $l_ee_uri eq $l_admin_uri ) ||
< ( $l_ee_uri eq $l_unsecure_uri ) ||
< ( $l_ee_uri eq $l_tomcat_uri ) ||
< ( $l_admin_uri eq $l_unsecure_uri ) ||
< ( $l_admin_uri eq $l_tomcat_uri ) ||
< ( $l_unsecure_uri eq $l_tomcat_uri ) ) {
---
> # IP Separated Ports: all "hostname:port" combinations
> # must be unique
> if( ( $l_agent_hostport eq $l_admin_hostport ) ||
> ( $l_agent_hostport eq $l_ee_hostport ) ||
> ( $l_agent_hostport eq $l_unsecure_hostport ) ||
> ( $l_agent_hostport eq $l_tomcat_hostport ) ||
> ( $l_ee_hostport eq $l_admin_hostport ) ||
> ( $l_ee_hostport eq $l_unsecure_hostport ) ||
> ( $l_ee_hostport eq $l_tomcat_hostport ) ||
> ( $l_admin_hostport eq $l_unsecure_hostport ) ||
> ( $l_admin_hostport eq $l_tomcat_hostport ) ||
> ( $l_unsecure_hostport eq $l_tomcat_hostport ) ) {
898c907
< return $PKI_UNKNOWN_PORT_MODE;
---
> return $PKI_IP_DUPLICATE_HOSTNAME_PORT;
911c920,924
< return $PKI_UNKNOWN_PORT_MODE;
---
> if( $subsystem_type eq $RA ) {
> return $PKI_DUPLICATE_RA_CONNECTOR_PORTS;
> } elsif( $subsystem_type eq $TPS ) {
> return $PKI_DUPLICATE_TPS_CONNECTOR_PORTS;
> }
diff -r 20130410/pki/base/setup/pkicreate 20130413/pki/base/setup/pkicreate
443c443
< my $SUBSYSTEM_TYPE = "";
---
> my $uc_subsystem_type = "";
469,474c469,474
< my $agent_uri = "";
< my $ee_uri = "";
< my $ee_client_auth_uri = "";
< my $admin_uri = "";
< my $unsecure_uri = "";
< my $tomcat_uri = "";
---
> my $agent_hostport = "";
> my $ee_hostport = "";
> my $ee_client_auth_hostport = "";
> my $admin_hostport = "";
> my $unsecure_hostport = "";
> my $tomcat_hostport = "";
1298c1298
< $SUBSYSTEM_TYPE = uc $subsystem_type;
---
> $uc_subsystem_type = uc $subsystem_type;
1339,1340c1339,1340
< . "'$SUBSYSTEM_TYPE' subsystems; NO values for agent, admin, "
< . "ee, or ee client auth hostnames should be specified!\n",
---
> . "'$uc_subsystem_type' subsystems; NO values for agent, admin,"
> . " ee, or ee client auth hostnames should be specified!\n",
1392c1392
< emit( "For '$SUBSYSTEM_TYPE' subsystems, if attempting "
---
> emit( "For '$uc_subsystem_type' subsystems, if attempting "
1557,1559c1557,1559
< # Establish all '<hostname>:<port>' URIs
< $agent_uri = $agent_hostname . ':' . $agent_secure_port;
< $ee_uri = $ee_hostname . ':' . $ee_secure_port;
---
> # Establish all '<hostname>:<port>' combinations
> $agent_hostport = $agent_hostname . ':' . $agent_secure_port;
> $ee_hostport = $ee_hostname . ':' . $ee_secure_port;
1561,1562c1561,1562
< $ee_client_auth_uri = $ee_client_auth_hostname . ':'
< . $ee_secure_client_auth_port;
---
> $ee_client_auth_hostport = $ee_client_auth_hostname . ':'
> . $ee_secure_client_auth_port;
1564,1566c1564,1566
< $admin_uri = $admin_hostname . ':' . $admin_secure_port;
< $unsecure_uri = $ee_hostname . ':' . $unsecure_port;
< $tomcat_uri = $host . ':' . $tomcat_server_port;
---
> $admin_hostport = $admin_hostname . ':' . $admin_secure_port;
> $unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
> $tomcat_hostport = $host . ':' . $tomcat_server_port;
1581,1583c1581,1583
< # Establish all '<hostname>:<port>' URIs
< $agent_uri = $agent_hostname . ':' . $agent_secure_port;
< $ee_uri = $ee_hostname . ':' . $ee_secure_port;
---
> # Establish all '<hostname>:<port>' combinations
> $agent_hostport = $agent_hostname . ':' . $agent_secure_port;
> $ee_hostport = $ee_hostname . ':' . $ee_secure_port;
1585,1586c1585,1586
< $ee_client_auth_uri = $ee_client_auth_hostname . ':'
< . $ee_secure_client_auth_port;
---
> $ee_client_auth_hostport = $ee_client_auth_hostname . ':'
> . $ee_secure_client_auth_port;
1588,1590c1588,1590
< $admin_uri = $admin_hostname . ':' . $admin_secure_port;
< $unsecure_uri = $ee_hostname . ':' . $unsecure_port;
< $tomcat_uri = $host . ':' . $tomcat_server_port;
---
> $admin_hostport = $admin_hostname . ':' . $admin_secure_port;
> $unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
> $tomcat_hostport = $host . ':' . $tomcat_server_port;
1605,1607c1605,1607
< # Establish all '<hostname>:<port>' URIs
< $agent_uri = $agent_hostname . ':' . $secure_port;
< $ee_uri = $ee_hostname . ':' . $secure_port;
---
> # Establish all '<hostname>:<port>' combinations
> $agent_hostport = $agent_hostname . ':' . $secure_port;
> $ee_hostport = $ee_hostname . ':' . $secure_port;
1609c1609
< $ee_client_auth_uri = $ee_client_auth_hostname . ':'
---
> $ee_client_auth_hostport = $ee_client_auth_hostname . ':'
1612,1614c1612,1614
< $admin_uri = $admin_hostname . ':' . $secure_port;
< $unsecure_uri = $ee_hostname . ':' . $unsecure_port;
< $tomcat_uri = $host . ':' . $tomcat_server_port;
---
> $admin_hostport = $admin_hostname . ':' . $secure_port;
> $unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
> $tomcat_hostport = $host . ':' . $tomcat_server_port;
1626,1630c1626,1630
< # Establish all '<hostname>:<port>' URIs
< $agent_uri = $agent_hostname . ':' . $secure_port;
< $ee_uri = $ee_hostname . ':' . $secure_port;
< $admin_uri = $admin_hostname . ':' . $secure_port;
< $unsecure_uri = $ee_hostname . ':' . $unsecure_port;
---
> # Establish all '<hostname>:<port>' combinations
> $agent_hostport = $agent_hostname . ':' . $secure_port;
> $ee_hostport = $ee_hostname . ':' . $secure_port;
> $admin_hostport = $admin_hostname . ':' . $secure_port;
> $unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
1642,1646c1642,1646
< # Establish all '<hostname>:<port>' URIs
< $agent_uri = $agent_hostname . ':' . $secure_port;
< $ee_uri = $ee_hostname . ':' . $secure_port;
< $admin_uri = $admin_hostname . ':' . $secure_port;
< $unsecure_uri = $ee_hostname . ':' . $unsecure_port;
---
> # Establish all '<hostname>:<port>' combinations
> $agent_hostport = $agent_hostname . ':' . $secure_port;
> $ee_hostport = $ee_hostname . ':' . $secure_port;
> $admin_hostport = $admin_hostname . ':' . $secure_port;
> $unsecure_hostport = $ee_hostname . ':' . $unsecure_port;
1648c1648,1649
< } elsif( $mode eq $PKI_UNKNOWN_PORT_MODE ) {
---
> } else {
> # Port Configuration Mode Error: Display usage with error message
1650c1651
< emit( "Invalid port configuration mode!\n","error" );
---
> emit( "$mode\n","error" );
diff -r 20130410/pki/base/silent/.svn/entries 20130413/pki/base/silent/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-21T19:36:45.980348Z
< 2531
---
> 2013-04-11T20:38:49.312670Z
> 2559
diff -r 20130410/pki/base/silent/config/.svn/entries 20130413/pki/base/silent/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/silent/scripts/.svn/entries 20130413/pki/base/silent/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/silent/src/.svn/entries 20130413/pki/base/silent/src/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
diff -r 20130410/pki/base/silent/src/argparser/.svn/entries 20130413/pki/base/silent/src/argparser/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/silent/src/ca/.svn/entries 20130413/pki/base/silent/src/ca/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:42.000000Z
< 82bff3fac40bdc142c8dd62074676dbd
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:08.000000Z
> b45a4d284155de983ede987888467aa4
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 73647
---
> 73574
diff -r 20130410/pki/base/silent/src/ca/.svn/text-base/ConfigureCA.java.svn-base 20130413/pki/base/silent/src/ca/.svn/text-base/ConfigureCA.java.svn-base
1106d1105
< System.out.println("Cert to Import =" + cert_to_import);
diff -r 20130410/pki/base/silent/src/ca/ConfigureCA.java 20130413/pki/base/silent/src/ca/ConfigureCA.java
1106d1105
< System.out.println("Cert to Import =" + cert_to_import);
diff -r 20130410/pki/base/silent/src/common/.svn/entries 20130413/pki/base/silent/src/common/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
307,310c307,310
< 2013-02-21T01:38:43.000000Z
< 7f15c64e72517d25ae08e9b6d48dfeba
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:08.000000Z
> a3c38a50828191700a84d6a6563a5873
> 2013-04-11T20:38:49.312670Z
> 2559
333c333
< 25905
---
> 27584
diff -r 20130410/pki/base/silent/src/common/.svn/text-base/ComCrypto.java.svn-base 20130413/pki/base/silent/src/common/.svn/text-base/ComCrypto.java.svn-base
36a37
> import org.mozilla.jss.crypto.InternalCertificate;
251,252d251
<
<
270c269,296
< return true;
---
> /*
> * failing to import cert should not be detrimental. When failed,
> * allow to continue and user can manually import them later.
> * Same with trust setting.
> */
> if (cert != null)
> System.out.println("importCert string: importCertPackage() succeeded");
> else
> System.out.println("importCert string: importCertPackage() failed");
>
> /* set trust bits for the issuer CA cert */
> System.out.println("importCert string: set CA trust bits");
> X509Certificate[] ca_certs = manager.getCACerts();
> for (int i =0; i< ca_certs.length; i++) {
> // look for the signing CA
> if (ca_certs[i].getSubjectDN().toString().equals(
> cert.getIssuerDN().toString())) {
> // set the trust bits
> InternalCertificate icert =
> (InternalCertificate) ca_certs[i];
> icert.setSSLTrust(InternalCertificate.TRUSTED_CA
> | InternalCertificate.TRUSTED_CLIENT_CA
> | InternalCertificate.VALID_CA);
>
> System.out.println("importCert string: CA trust bits set");
> break;
> }
> }
274c300
< "ERROR:exception importing cert " + e.getMessage());
---
> "ERROR: exception importing cert: " + e.getMessage());
276c302
< return false;
---
> // return false;
278c304
<
---
> return true;
297a324,328
> // adjust the trust bits
> InternalCertificate icert = (InternalCertificate) cert;
> icert.setSSLTrust(InternalCertificate.TRUSTED_CA
> | InternalCertificate.TRUSTED_CLIENT_CA
> | InternalCertificate.VALID_CA);
diff -r 20130410/pki/base/silent/src/common/ComCrypto.java 20130413/pki/base/silent/src/common/ComCrypto.java
36a37
> import org.mozilla.jss.crypto.InternalCertificate;
251,252d251
<
<
270c269,296
< return true;
---
> /*
> * failing to import cert should not be detrimental. When failed,
> * allow to continue and user can manually import them later.
> * Same with trust setting.
> */
> if (cert != null)
> System.out.println("importCert string: importCertPackage() succeeded");
> else
> System.out.println("importCert string: importCertPackage() failed");
>
> /* set trust bits for the issuer CA cert */
> System.out.println("importCert string: set CA trust bits");
> X509Certificate[] ca_certs = manager.getCACerts();
> for (int i =0; i< ca_certs.length; i++) {
> // look for the signing CA
> if (ca_certs[i].getSubjectDN().toString().equals(
> cert.getIssuerDN().toString())) {
> // set the trust bits
> InternalCertificate icert =
> (InternalCertificate) ca_certs[i];
> icert.setSSLTrust(InternalCertificate.TRUSTED_CA
> | InternalCertificate.TRUSTED_CLIENT_CA
> | InternalCertificate.VALID_CA);
>
> System.out.println("importCert string: CA trust bits set");
> break;
> }
> }
274c300
< "ERROR:exception importing cert " + e.getMessage());
---
> "ERROR: exception importing cert: " + e.getMessage());
276c302
< return false;
---
> // return false;
278c304
<
---
> return true;
297a324,328
> // adjust the trust bits
> InternalCertificate icert = (InternalCertificate) cert;
> icert.setSSLTrust(InternalCertificate.TRUSTED_CA
> | InternalCertificate.TRUSTED_CLIENT_CA
> | InternalCertificate.VALID_CA);
diff -r 20130410/pki/base/silent/src/drm/.svn/entries 20130413/pki/base/silent/src/drm/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:42.000000Z
< f19f22bbc322a4e6605153005be039d9
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:07.000000Z
> 1826e5d88ff1f46405bd2577a3645955
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 55851
---
> 55852
diff -r 20130410/pki/base/silent/src/drm/.svn/text-base/ConfigureDRM.java.svn-base 20130413/pki/base/silent/src/drm/.svn/text-base/ConfigureDRM.java.svn-base
842c842
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/drm/ConfigureDRM.java 20130413/pki/base/silent/src/drm/ConfigureDRM.java
842c842
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/http/.svn/entries 20130413/pki/base/silent/src/http/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/silent/src/ocsp/.svn/entries 20130413/pki/base/silent/src/ocsp/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:43.000000Z
< 4bb1b5d3f16f786df685118357f1e12f
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:08.000000Z
> 8799b825f8dc81ae368a8aeb98c1d1fb
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 49409
---
> 49410
diff -r 20130410/pki/base/silent/src/ocsp/.svn/text-base/ConfigureOCSP.java.svn-base 20130413/pki/base/silent/src/ocsp/.svn/text-base/ConfigureOCSP.java.svn-base
746c746
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/ocsp/ConfigureOCSP.java 20130413/pki/base/silent/src/ocsp/ConfigureOCSP.java
746c746
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/ra/.svn/entries 20130413/pki/base/silent/src/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/silent/src/ra/ConfigureRA.java 20130413/pki/base/silent/src/ra/ConfigureRA.java
76a77
> public static String ca_admin_hostname = null;
299a301,302
> // 'ca_url' is not used, but refers to
> // the CA EE hostname and the CA EE port
441a445,446
> // 'ca_url' is not used, but refers to
> // the CA EE hostname and the CA EE port
523a529,530
> // 'auth_hostname' references the CA EE hostname
> // 'auth_port' references the CA EE port
575a583,593
> // Account for a connection to a CA that has been
> // configured with IP Port Configuration Mode.
> if ( ca_admin_hostname == null ) {
> // A missing 'ca_admin_hostname' implies that the CA
> // may have been configured with a single hostname
> // (i. e. - Port Configuration Mode). Try setting
> // 'ca_admin_hostname' to 'ca_hostname', although
> // this may still fail.
> ca_admin_hostname = ca_hostname;
> }
>
581c599
< hr = hc.sslConnect(ca_hostname,ca_admin_port,admin_uri,query_string);
---
> hr = hc.sslConnect(ca_admin_hostname,ca_admin_port,admin_uri,query_string);
620c638
< URLEncoder.encode( ca_hostname ) +
---
> URLEncoder.encode( ca_admin_hostname ) +
778a797
> StringHolder x_ca_admin_hostname = new StringHolder();
838c857
< parser.addOption ("-ca_hostname %s #CA Hostname",
---
> parser.addOption ("-ca_hostname %s #CA EE Hostname",
839a859,860
> parser.addOption ("-ca_admin_hostname %s #CA Admin Hostname",
> x_ca_admin_hostname);
919a941
> ca_admin_hostname = x_ca_admin_hostname.value;
diff -r 20130410/pki/base/silent/src/subca/.svn/entries 20130413/pki/base/silent/src/subca/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:43.000000Z
< d7939ebdc9a7aa8e7e21c295ec0239a8
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:08.000000Z
> cd6943ecef4270c0b232da160ad9ed22
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 53544
---
> 53545
diff -r 20130410/pki/base/silent/src/subca/.svn/text-base/ConfigureSubCA.java.svn-base 20130413/pki/base/silent/src/subca/.svn/text-base/ConfigureSubCA.java.svn-base
785c785
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/subca/ConfigureSubCA.java 20130413/pki/base/silent/src/subca/ConfigureSubCA.java
785c785
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/tks/.svn/entries 20130413/pki/base/silent/src/tks/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:42.000000Z
< ef1ebda5d90526a375fb84c3c01ce9af
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:07.000000Z
> a0ccc90176cc939ac7cb2bab0e3a3b1d
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 45422
---
> 45423
diff -r 20130410/pki/base/silent/src/tks/.svn/text-base/ConfigureTKS.java.svn-base 20130413/pki/base/silent/src/tks/.svn/text-base/ConfigureTKS.java.svn-base
715c715
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/tks/ConfigureTKS.java 20130413/pki/base/silent/src/tks/ConfigureTKS.java
715c715
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/tps/.svn/entries 20130413/pki/base/silent/src/tps/.svn/entries
4c4
< 2554
---
> 2564
10,11c10,11
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-11T20:38:49.312670Z
> 2559
35,38c35,38
< 2013-02-21T01:38:43.000000Z
< 497a49c8a293fd0f288abf00b04f8c20
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T02:42:08.000000Z
> 0bb71f05056fd8eda1e4d570d8573508
> 2013-04-11T20:38:49.312670Z
> 2559
61c61
< 35736
---
> 35737
diff -r 20130410/pki/base/silent/src/tps/.svn/text-base/ConfigureTPS.java.svn-base 20130413/pki/base/silent/src/tps/.svn/text-base/ConfigureTPS.java.svn-base
738c738
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
diff -r 20130410/pki/base/silent/src/tps/ConfigureTPS.java 20130413/pki/base/silent/src/tps/ConfigureTPS.java
76a77
> public static String ca_admin_hostname = null;
345a347,348
> // 'ca_url' is not used, but refers to
> // the CA EE hostname and the CA EE port
572a576,577
> // 'ca_url' is not used, but refers to
> // the CA EE hostname and the CA EE port
667a673,674
> // 'auth_hostname' references the CA EE hostname
> // 'auth_port' references the CA EE port
719a727,737
> // Account for a connection to a CA that has been
> // configured with IP Port Configuration Mode.
> if ( ca_admin_hostname == null ) {
> // A missing 'ca_admin_hostname' implies that the CA
> // may have been configured with a single hostname
> // (i. e. - Port Configuration Mode). Try setting
> // 'ca_admin_hostname' to 'ca_hostname', although
> // this may still fail.
> ca_admin_hostname = ca_hostname;
> }
>
725c743
< hr = hc.sslConnect(ca_hostname,ca_admin_port,admin_uri,query_string);
---
> hr = hc.sslConnect(ca_admin_hostname,ca_admin_port,admin_uri,query_string);
738c756
< System.out.println("Imported Cert=" + cert_to_import);
---
> System.out.println("Cert to Import=" + cert_to_import);
765c783
< URLEncoder.encode( ca_hostname ) +
---
> URLEncoder.encode( ca_admin_hostname ) +
933a952
> StringHolder x_ca_admin_hostname = new StringHolder();
1026c1045
< parser.addOption ("-ca_hostname %s #CA Hostname",
---
> parser.addOption ("-ca_hostname %s #CA EE Hostname",
1027a1047,1048
> parser.addOption ("-ca_admin_hostname %s #CA Admin Hostname",
> x_ca_admin_hostname);
1160a1182
> ca_admin_hostname = x_ca_admin_hostname.value;
diff -r 20130410/pki/base/silent/templates/.svn/entries 20130413/pki/base/silent/templates/.svn/entries
4c4
< 2558
---
> 2564
10,11c10,11
< 2013-02-21T19:36:45.980348Z
< 2531
---
> 2013-04-11T20:38:49.312670Z
> 2559
29c29
< silentEC_readme.txt
---
> silent_ocsp_ip_port.template
30a31
> 0
33,41c34
<
<
< 2013-02-21T01:38:44.000000Z
< dfc13aaa1353e5849b1d320f4668d4f1
< 2013-02-20T22:02:49.508780Z
< 2526
< cfu
<
<
---
> add
46a40,45
> has-props
> has-prop-mods
>
> silent_ra_to_ip_port.template
> file
> 0
48a48
> add
53a54,59
> has-props
> has-prop-mods
>
> silent_tps_to_ip_port.template
> file
> 0
55a62
> add
61c68,69
< 115
---
> has-props
> has-prop-mods
63c71
< silentEC_tks.template
---
> silentEC_subca.template
69,72c77,80
< 2013-03-22T01:03:40.000000Z
< cb3b6b9e8c672d39cb6ae3eb1001fa98
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T03:15:05.000000Z
> ffe6eb492ab95f5db3cb93c0025daf20
> 2013-04-11T20:38:49.312670Z
> 2559
95c103
< 19316
---
> 22867
97,111c105
< silent_kra_ip_port.template
< file
< 0
<
<
< add
<
<
<
<
<
< has-props
< has-prop-mods
<
< silentEC_ca.template
---
> silentEC_readme.txt
117,118c111,112
< 2013-03-22T01:03:40.000000Z
< 00f1a73bbb761f0ce124cd1b4967a89d
---
> 2013-04-13T03:15:05.000000Z
> dfc13aaa1353e5849b1d320f4668d4f1
122d115
< has-props
143c136,137
< 24086
---
>
> 115
145c139
< silentEC_ocsp.template
---
> silentEC_tks.template
151,154c145,148
< 2013-03-22T01:03:40.000000Z
< c4b5f6b7b83a0c1fa7bfbabd8b9fe16e
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T03:15:05.000000Z
> 10a8bcd35971d6a0c3057cc8bef95406
> 2013-04-11T20:38:49.312670Z
> 2559
177c171
< 19853
---
> 19262
179c173
< subca_silent.template
---
> silent_kra_ip_port.template
180a175
> 0
182a178
> add
185,190d180
< 2013-03-22T01:03:40.000000Z
< 5ce11c97d5387f007adbf1aaf3f1e4d5
< 2013-02-21T19:36:45.980348Z
< 2531
< cfu
< has-props
193a184,188
> has-props
> has-prop-mods
>
> silentEC_ocsp.template
> file
197a193,198
> 2013-04-13T03:15:05.000000Z
> 12f5b50280431da90134d2c55dfc3b4e
> 2013-04-11T20:38:49.312670Z
> 2559
> cfu
> has-props
211,215d211
< 19959
<
< silent_tks_ip_port.template
< file
< 0
218d213
< add
224,225c219
< has-props
< has-prop-mods
---
> 19670
233,236c227,230
< 2013-03-22T01:03:40.000000Z
< 6b62c8058655df22ed5accfd95dfca54
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T03:15:05.000000Z
> a4a9df6f78b4e8020d1aff846e324cca
> 2013-04-11T20:38:49.312670Z
> 2559
259c253
< 19978
---
> 19793
275c269
< silent_ocsp_ip_port.template
---
> pki_silent.template
277d270
< 0
280c273,280
< add
---
>
>
> 2013-04-13T01:11:04.000000Z
> 8084968320ea19bcd9cce57e9e983a3a
> 2013-04-11T20:38:49.312670Z
> 2559
> cfu
> has-props
286,287c286,301
< has-props
< has-prop-mods
---
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
> 72509
289c303
< pki_silent.template
---
> silentEC_kra.template
295,298c309,312
< 2013-03-22T01:03:40.000000Z
< 0856601e9a370e08411628ae45056b01
< 2013-02-21T19:36:45.980348Z
< 2531
---
> 2013-04-13T03:15:05.000000Z
> c8a2999a74286ab38db07e19f85db621
> 2013-04-11T20:38:49.312670Z
> 2559
321c335
< 72548
---
> 22168
323c337
< silentEC_kra.template
---
> silentEC_ca.template
329,332c343,346
< 2013-03-22T01:03:40.000000Z
< 9fe8cc4f24e4dda0f0f2e294a7db4b23
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T03:15:05.000000Z
> 2b0fa0895c8e293a5e893326ae31ed02
> 2013-04-11T20:38:49.312670Z
> 2559
355c369
< 22231
---
> 24031
357c371
< silentEC_subca.template
---
> subca_silent.template
363,366c377,380
< 2013-03-22T01:03:40.000000Z
< c16fef52fef6465731a37af3b4526ed5
< 2013-02-20T22:02:49.508780Z
< 2526
---
> 2013-04-13T01:11:04.000000Z
> a66b35aff865e62010c59f9441cdb95c
> 2013-04-11T20:38:49.312670Z
> 2559
389c403,417
< 22930
---
> 19947
>
> silent_tks_ip_port.template
> file
> 0
>
>
> add
>
>
>
>
>
> has-props
> has-prop-mods
Only in 20130413/pki/base/silent/templates/.svn/props: silent_ra_to_ip_port.template.svn-work
Only in 20130413/pki/base/silent/templates/.svn/props: silent_tps_to_ip_port.template.svn-work
diff -r 20130410/pki/base/silent/templates/.svn/text-base/pki_silent.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/pki_silent.template.svn-base
83c83
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
809,810c809,810
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
1080c1080
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1151c1151
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1214c1214
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1286c1286
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1360c1360
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1430c1430
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1503c1503
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1571c1571
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1637c1637
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1709c1709
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_ca.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_ca.template.svn-base
95c95
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
98c98
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
411,412c411,412
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
498c498
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user
503c503
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
505c505
< printf " required by '${pki_silent_script}' exists at the\n"
---
> printf " required by '${pki_silent_script}' at the\n"
507,508c507
< printf "\n"
< printf " Continue...\n\n"
---
> printf " are to be used \n\n"
555c554
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_kra.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_kra.template.svn-base
94c94
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
97c97
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
386,387c386,387
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
473c473
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
478c478
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The security databases\n"
480c480
< printf " required by '${pki_silent_script}' exists at the\n"
---
> printf " required by '${pki_silent_script}' at the\n"
482,483c482
< printf "\n"
< printf " Continue...\n\n"
---
> printf " are to be used.\n\n"
516c515
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_ocsp.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_ocsp.template.svn-base
93c93
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
96c96
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
339,340c339,340
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
426c426
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user
431c431
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
433c433
< printf " required by '${pki_silent_script}' exists at the\n"
---
> printf " required by '${pki_silent_script}' at the\n"
435,437c435
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
---
> printf " are to be used.\n\n"
469c467
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_subca.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_subca.template.svn-base
98c98
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
101c101
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
369,370c369,370
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
456c456
< ## Instead, inform the user and continue with this script.
---
> ## Instead, just inform the user.
461c461
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
463c463
< printf " required by '${subca_silentEC_script}' exists at the\n"
---
> printf " required by '${subca_silentEC_script}' at the\n"
465,466c465
< printf "\n"
< printf " Continue...\n\n"
---
> printf " are to be used.\n\n"
523c522
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_tks.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_tks.template.svn-base
94c94
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
97c97
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
338,339c338,339
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
426c426
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
431c431
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
433c433
< printf " required by '${pki_silent_script}' exists at the\n"
---
> printf " required by '${pki_silent_script}' at the\n"
435,436c435
< printf "\n"
< printf " Continue...\n\n"
---
> printf " are to be used.\n\n"
468c467
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/silentEC_tps.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/silentEC_tps.template.svn-base
96c96
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
99c99
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
351,352c351,352
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
438c438
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
443c443
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
445c445
< printf " required by '${pki_silent_script}' exists at the\n"
---
> printf " required by '${pki_silent_script}' at the\n"
447,449c447
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
---
> printf " are to be used.\n\n"
489c487
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/.svn/text-base/subca_silent.template.svn-base 20130413/pki/base/silent/templates/.svn/text-base/subca_silent.template.svn-base
86c86
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
317,318c317,318
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
475c475
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/pki_silent.template 20130413/pki/base/silent/templates/pki_silent.template
83c83
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
708a709
> ra_chosen_ca_admin_hostname=${pki_security_domain_host}
763a765
> tps_chosen_ca_admin_hostname=${pki_security_domain_host}
809,810c811,812
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
1080c1082
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1151c1153
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1214c1216
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1286c1288
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1360c1362
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1430c1432
< # -client_certdb_pwd ${pki_silent_security_database_password} \
---
> # -client_certdb_pwd ${pki_silent_security_token_password} \
1503c1505
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1571c1573
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1632a1635
> -ca_admin_hostname ${ra_chosen_ca_admin_hostname} \
1637c1640
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
1699a1703
> -ca_admin_hostname ${tps_chosen_ca_admin_hostname} \
1709c1713
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_ca.template 20130413/pki/base/silent/templates/silentEC_ca.template
25c25
< printf " (2) Install (but not configure) the Root CA subsystem instance\n"
---
> printf " (2) Install (but do NOT configure) the Root CA subsystem instance\n"
27c27
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
---
> printf " Follow ECC setup instructions in silentEC_readme.txt.\n\n"
30,31c30,31
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_ec_ca_instance')\n\n"
---
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_ca_instance').\n\n"
38c38
< printf " configure a 'default' CA subsystem instance.\n"
---
> printf " configure this CA subsystem instance\n"
95c95
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
98c98
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
411,412c411,412
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
498c498
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
503c503
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
505,509c505,508
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Continue...\n\n"
< # exit 255
---
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
> # exit 255
513c512
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_ca_log}'
555c554
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_kra.template 20130413/pki/base/silent/templates/silentEC_kra.template
18,20d17
< printf "Important:\n"
< printf " Use the following reference for essential EC setup prior to running this script:\n"
< printf " silentEC_readme.txt.\n\n"
21a19,22
> printf "Important: Use the following reference for essential EC setup\n"
> printf " prior to running this script:\n"
> printf "\n"
> printf " silentEC_readme.txt.\n\n"
26,27c27,28
< printf " (3) Install (but not configure) a DRM subsystem instance\n"
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
---
> printf " (3) Install (but do NOT configure) a DRM subsystem instance.\n\n"
> printf " Follow ECC setup instructions in silentEC_readme.txt.\n\n"
30,31c31,32
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_kra_ec_instances')\n\n"
---
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_kra_instance').\n\n"
36c37
< printf " (8) Become the DRM administrator user (not 'root' user),\n"
---
> printf " (8) Become the DRM administrator user (NOT 'root' user),\n"
38c39
< printf " configure the DRM subsystem instances.\n\n"
---
> printf " configure this DRM subsystem instance.\n\n"
94c95
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
97c98
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
386,387c387,388
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
473c474
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
478c479
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
480,483c481,483
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Continue...\n\n"
---
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
488c488
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_kra_log}'
516c516
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_ocsp.template 20130413/pki/base/silent/templates/silentEC_ocsp.template
18,19d17
< printf " Use the following reference for essential EC setup prior to running this script:\n"
< printf " silentEC_readme.txt.\n\n"
20a19,22
> printf "Important: Use the following reference for essential EC setup\n"
> printf " prior to running this script:\n"
> printf "\n"
> printf " silentEC_readme.txt.\n\n"
25,26c27,28
< printf " (3) Install (but not configure) a OCSP subsystem instance\n"
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
---
> printf " (3) Install (but do NOT configure) an OCSP subsystem instance.\n\n"
> printf " Follow ECC setup instructions in silentEC_readme.txt.\n\n"
29,30c31,32
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_ocsp_ec_instances')\n\n"
---
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_ocsp_instance').\n\n"
35c37
< printf " (8) Become the OCSP administrator user (not 'root' user),\n"
---
> printf " (8) Become the OCSP administrator user (NOT 'root' user),\n"
37c39
< printf " configure the OCSP subsystem instances.\n\n"
---
> printf " configure this OCSP subsystem instance.\n\n"
93c95
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
96c98
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
339,340c341,342
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
426c428
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
431c433
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
433,437c435,437
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
---
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
442c442
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_ocsp_log}'
469c469
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_subca.template 20130413/pki/base/silent/templates/silentEC_subca.template
30c30
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
---
> printf " Follow ECC setup instructions in 'silentEC_readme.txt'.\n\n"
33,34c33,34
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_ec_subca_instance')\n\n"
---
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_subca_instance').\n\n"
39c39
< printf " (8) Become the subca administrator user (NOT 'root' user),\n"
---
> printf " (8) Become the Subordinate CA administrator user (NOT 'root' user),\n"
41c41
< printf " configure a Subordinate CA subsystem instance.\n\n"
---
> printf " configure this Subordinate CA subsystem instance.\n\n"
98c98
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
101c101
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
369,370c369,370
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
456c456
< ## Instead, inform the user and continue with this script.
---
> ## Instead, just inform the user.
461c461
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
463,466c463,465
< printf " required by '${subca_silentEC_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Continue...\n\n"
---
> printf " required by '${subca_silentEC_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
471c470
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_subca_log}'
523c522
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_tks.template 20130413/pki/base/silent/templates/silentEC_tks.template
18,20d17
< printf "Important:\n"
< printf " Use the following reference for essential EC setup prior to running this script:\n"
< printf " silentEC_readme.txt.\n\n"
21a19,22
> printf "Important: Use the following reference for essential EC setup\n"
> printf " prior to running this script:\n"
> printf "\n"
> printf " silentEC_readme.txt.\n\n"
26,32c27,33
< printf " (3) Install (but not configure) a TKS subsystem instance.\n"
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
< printf " (3) Install the 'pki-silent' package.\n\n"
< printf " (4) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_tks_ec_instances')\n\n"
< printf " (5) Fill in all MANDATORY user-defined variables\n"
---
> printf " (3) Install (but do NOT configure) a TKS subsystem instance.\n\n"
> printf " Follow ECC setup instructions in 'silentEC_readme.txt'.\n\n"
> printf " (4) Install the 'pki-silent' package.\n\n"
> printf " (5) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_tks_instance').\n\n"
> printf " (6) Fill in all MANDATORY user-defined variables\n"
34c35
< printf " (6) Change any OPTIONAL user-defined variables\n"
---
> printf " (7) Change any OPTIONAL user-defined variables\n"
36c37
< printf " (7) Become the TKS administrator user (not 'root' user),\n"
---
> printf " (8) Become the TKS administrator user (NOT 'root' user),\n"
38c39
< printf " configure the TKS subsystem instances.\n\n"
---
> printf " configure this TKS subsystem instance.\n\n"
94c95
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
97c98
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
338,339c339,340
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
426c427
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
431c432
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
433,436c434,436
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Continue...\n\n"
---
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
441c441
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_tks_log}'
468c468
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silentEC_tps.template 20130413/pki/base/silent/templates/silentEC_tps.template
17,40c17,41
< if [ "${pki_silent_script}" = "pki_silent.template" ] ; then
< printf "Important:\n"
< printf " Use the following reference for essential EC setup prior to running this script:\n"
< printf " silentEC_readme.txt.\n\n"
< printf "\n"
< printf "\n"
< printf "Usage: (1) Install AND configure a directory server instance.\n\n"
< printf " (2) Install AND configure a Root CA subsystem instance\n"
< printf " that is its own security domain.\n\n"
< printf " (3) Install and configure a TKS subsystem instance\n"
< printf " (4) (optionally) Install and configure a DRM subsystem instance\n"
< printf " (5) Install (but not configure) a TPS subsystem instance\n"
< printf " Follow ECC setup instruction in silentEC_readme.txt.\n"
< printf " (6) Install the 'pki-silent' package.\n\n"
< printf " (7) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_tps_ec_instances')\n\n"
< printf " (8) Fill in all MANDATORY user-defined variables\n"
< printf " in the new script.\n\n"
< printf " (9) Change any OPTIONAL user-defined variables\n"
< printf " in the new script as desired.\n\n"
< printf " (10) Become the TPS administrator user (not 'root' user),\n"
< printf " and execute the new script to\n"
< printf " configure the TPS subsystem instances.\n\n"
---
> if [ "${pki_silent_script}" = "silentEC_tps.template" ] ; then
> printf "\n"
> printf "Important: Use the following reference for essential EC setup\n"
> printf " prior to running this script:\n"
> printf "\n"
> printf " silentEC_readme.txt.\n\n"
> printf "\n"
> printf "Usage: ( 1) Install AND configure a directory server instance.\n\n"
> printf " ( 2) Install AND configure a Root CA subsystem instance\n"
> printf " that is its own security domain.\n\n"
> printf " ( 3) Install AND configure a TKS subsystem instance.\n\n"
> printf " ( 4) (optionally) Install and configure a DRM subsystem instance.\n\n"
> printf " ( 5) Install (but do NOT configure) a TPS subsystem instance.\n\n"
> printf " Follow ECC setup instructions in 'silentEC_readme.txt'.\n\n"
> printf " ( 6) Install the 'pki-silent' package.\n\n"
> printf " ( 7) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ec_tps_instance').\n\n"
> printf " ( 8) Fill in all MANDATORY user-defined variables\n"
> printf " in the new script.\n\n"
> printf " ( 9) Change any OPTIONAL user-defined variables\n"
> printf " in the new script as desired.\n\n"
> printf " (10) Become the TPS administrator user (NOT 'root' user),\n"
> printf " and execute the new script to\n"
> printf " configure this TPS subsystem instance.\n\n"
96c97
< ##pki_silent_security_database_password="mypasswd"
---
> ##pki_silent_security_token_password="mypasswd"
99c100
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
289a291
> tps_chosen_ca_admin_hostname=${pki_security_domain_host}
351,352c353,354
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
438c440
< ## Instead, inform the user and exit this script.
---
> ## Instead, just inform the user.
443c445
< printf "WARNING: At least one of the security databases\n"
---
> printf "WARNING: The existing security databases\n"
445,449c447,449
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
---
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
454c454
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_tps_log}'
479a480
> -ca_admin_hostname ${tps_chosen_ca_admin_hostname} \
489c490
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/silent/templates/silent_ca_ip_port.template 20130413/pki/base/silent/templates/silent_ca_ip_port.template
17,33c17,33
< if [ "${pki_silent_script}" = "silent_ca_ip_port.template" ] ; then
< printf "\n"
< printf "Usage: (1) Install AND configure a directory server instance.\n\n"
< printf " (2) Install, but do NOT configure a\n"
< printf " 'default' PKI CA subsystem instance\n"
< printf " using the IP Port Separation Mode.\n\n"
< printf " (3) Install the 'pki-silent' package.\n\n"
< printf " (4) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_default_pki_ca_ip_port_instance')\n\n"
< printf " (5) Fill in all MANDATORY user-defined variables\n"
< printf " in the new script.\n\n"
< printf " (6) Change any OPTIONAL user-defined variables\n"
< printf " in the new script as desired.\n\n"
< printf " (7) Become the 'root' user, and execute the new script to\n"
< printf " configure this 'default' PKI CA subsystem instance.\n\n"
< exit 255
---
> if [ "${pki_silent_script}" = "silent_ca_ip_port.template" ] ; then
> printf "\n"
> printf "Usage: (1) Install AND configure a directory server instance.\n\n"
> printf " (2) Install, but do NOT configure a\n"
> printf " PKI CA subsystem instance\n"
> printf " using the IP Port Separation Mode.\n\n"
> printf " (3) Install the 'pki-silent' package.\n\n"
> printf " (4) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ca_ip_port_instance').\n\n"
> printf " (5) Fill in all MANDATORY user-defined variables\n"
> printf " in the new script.\n\n"
> printf " (6) Change any OPTIONAL user-defined variables\n"
> printf " in the new script as desired.\n\n"
> printf " (7) Become the 'root' user, and execute the new script to\n"
> printf " configure this PKI CA subsystem instance.\n\n"
> exit 255
45,47c45,47
< MY_EUID=`/usr/bin/id -u`
< MY_UID=`/usr/bin/id -ur`
< USERNAME=`/usr/bin/id -un`
---
> MY_EUID=`/usr/bin/id -u`
> MY_UID=`/usr/bin/id -ur`
> USERNAME=`/usr/bin/id -un`
49,50c49,50
< printf "ERROR: Unsupported operating system '${OS}'!\n"
< exit 255
---
> printf "ERROR: Unsupported operating system '${OS}'!\n"
> exit 255
53,56c53,56
< if [ "${MY_UID}" != "${ROOTUID}" ] &&
< [ "${MY_EUID}" != "${ROOTUID}" ] ; then
< printf "ERROR: The '$0' script must be run as root!\n"
< exit 255
---
> if [ "${MY_UID}" != "${ROOTUID}" ] &&
> [ "${MY_EUID}" != "${ROOTUID}" ] ; then
> printf "ERROR: The '$0' script must be run as root!\n"
> exit 255
81c81
< ## PKI Subsystem Hosts (FQDN)
---
> ## PKI CA Subsystem Hosts (FQDN)
86a87,107
> ##
> ## NOTE: Default PKI CA Instance Ports
> ##
> ## 9180 - non-secure port (not role specific)
> ## 9701 - non-secure Tomcat port
> ## 9443 - secure EE port
> ## 9444 - secure Agent port
> ## 9445 - secure Admin port
> ## 9446 - secure EE Client Auth port (not necessarily labeled)
> ##
> ##
> ## For Example:
> ##
> ## semanage port -l | grep pki
> ##
> ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445
> ##
>
> ## PKI CA ports
> pki_ca_admin_port=
>
90c111
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
120,121c141,142
< ## For testing, however, it is often convenient to simply OVERWRITE any exiting
< ## data in the LDAP database. If this is desirable, set:
---
> ## For testing, however, it is often convenient to simply OVERWRITE any
> ## existing data in the LDAP database. If this is desirable, set:
129,130c150,151
< ca_token_name=internal
< ca_token_password=
---
> pki_ca_token_name=internal
> pki_ca_token_password=
134c155
< ca_backup_password=
---
> pki_ca_backup_password=
154,158d174
<
< ##############################################################################
< ## P R E - D E F I N E D " D E F A U L T " V A R I A B L E S ##
< ##############################################################################
<
160c176
< ca_subsystem_name="Certificate\ Authority"
---
> pki_ca_subsystem_name="Certificate\ Authority"
163,181c179
< ca_instance_name="pki-ca"
<
< ##
< ## NOTE: Default CA Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ## *446 - secure EE Client Auth port
< ##
< ##
< ## For Example:
< ##
< ## semanage port -l | grep pki
< ##
< ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445, 9446
< ##
---
> pki_ca_instance_name="pki-ca"
183,189c181,182
< ## CA ports
< ca_nonssl_port=9180
< ca_agent_port=9443
< ca_ee_port=9444
< ca_admin_port=9445
< ca_ee_ca_port=9446
< ca_tomcat_server_port=9701
---
> ## PKI Silent Log Files
> pki_silent_ca_log=/tmp/ca.log
197,200d189
< ## PKI Silent Log Files
< pki_silent_ca_log=/tmp/ca.log
<
<
211c200
< ## CA Administrator of Instance ${ca_instance_name}'s
---
> ## CA Administrator of Instance ${pki_ca_instance_name}'s
222c211
< ## + "${ca_instance_name}'s "
---
> ## + "${pki_ca_instance_name}'s "
225c214
< ## + "${ca_instance_name},"
---
> ## + "${pki_ca_instance_name},"
238,239c227,228
< ## "/var/lib/${ca_instance_name}/alias/" security libraries would be
< ## something similar to this:
---
> ## "/var/lib/${pki_ca_instance_name}/alias/" security libraries would
> ## be something similar to this:
244,248c233,237
< ## ocspSigningCert cert-${ca_instance_name} u,u,u
< ## subsystemCert cert-${ca_instance_name} u,u,u
< ## caSigningCert cert-${ca_instance_name} CTu,Cu,Cu
< ## Server-Cert cert-${ca_instance_name} u,u,u
< ## auditSigningCert cert-${ca_instance_name} u,u,u
---
> ## ocspSigningCert cert-${pki_ca_instance_name} u,u,u
> ## subsystemCert cert-${pki_ca_instance_name} u,u,u
> ## caSigningCert cert-${pki_ca_instance_name} CTu,Cu,Cu
> ## Server-Cert cert-${pki_ca_instance_name} u,u,u
> ## auditSigningCert cert-${pki_ca_instance_name} u,u,u
252c241
< ## Nickname: "caSigningCert cert-${ca_instance_name}"
---
> ## Nickname: "caSigningCert cert-${pki_ca_instance_name}"
256c245
< ## Nickname: "subsystemCert cert-${ca_instance_name}"
---
> ## Nickname: "subsystemCert cert-${pki_ca_instance_name}"
260c249
< ## Nickname: "ocspSigningCert cert-${ca_instance_name}"
---
> ## Nickname: "ocspSigningCert cert-${pki_ca_instance_name}"
264c253
< ## Nickname: "Server-Cert cert-${ca_instance_name}"
---
> ## Nickname: "Server-Cert cert-${pki_ca_instance_name}"
268c257
< ## Nickname: "auditSigningCert cert-${ca_instance_name}"
---
> ## Nickname: "auditSigningCert cert-${pki_ca_instance_name}"
272,276c261,273
< ## NOTE: The parameters for the signing and key algorithms have the following meaning:
< ## ca_key_algorithm - signature algorithm used to sign the CA certificate
< ## ca_signing_algorithm - signature algorithm used by the CA and OCSP signing certs to sign objects.
< ## ca_signing_signingalgorithm - optionally specify the algorithm used by the CA signing cert to sign objects
< ## ca_ocsp_signing_signingalgorithm - optionally specify the algorithm used by the CA ocsp signing cert to sign objects
---
> ## NOTE: The parameters for the signing and key algorithms have the following
> ## meaning:
> ## ca_key_algorithm - signature algorithm used to sign
> ## the CA certificate
> ## ca_signing_algorithm - signature algorithm used by the
> ## CA and OCSP signing certs to sign
> ## objects.
> ## ca_signing_signingalgorithm - optionally specify the algorithm
> ## used by the CA signing cert to
> ## sign objects
> ## ca_ocsp_signing_signingalgorithm - optionally specify the algorithm
> ## used by the CA ocsp signing cert
> ## to sign objects
279c276,278
< ## remove_data - set to true/false. Remove any existing data found under the baseDN
---
> ## remove_data - set to true/false. Remove any
> ## existing data found under the
> ## baseDN
280a280
> ##
282c282
< ca_agent_name="CA\ Administrator\ of\ Instance\ ${ca_instance_name}\'s\ ${pki_security_domain_name}\ ID"
---
> ca_agent_name="CA\ Administrator\ of\ Instance\ ${pki_ca_instance_name}\'s\ ${pki_security_domain_name}\ ID"
285,287c285,287
< ca_agent_cert_subject="cn=CA\ Administrator\ of\ Instance\ ${ca_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
< ca_base_dn="dc=${pki_ca_admin_host}-${ca_instance_name}"
< ca_db_name="${pki_ca_admin_host}-${ca_instance_name}"
---
> ca_agent_cert_subject="cn=CA\ Administrator\ of\ Instance\ ${pki_ca_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
> ca_base_dn="dc=${pki_ca_admin_host}-${pki_ca_instance_name}"
> ca_db_name="${pki_ca_admin_host}-${pki_ca_instance_name}"
320,321c320,321
< printf "${usage_error_preamble} 'pki_ca_agent_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_agent_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
324,325c324,325
< printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
328,329c328,329
< printf "${usage_error_preamble} 'pki_ca_eeca_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_eeca_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
332,333c332,333
< printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
335,337c335,341
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ca_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
340,341c344,345
< printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
344,345c348,349
< printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
348,349c352,353
< printf "${usage_error_preamble} 'pki_ldap_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ldap_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
352,353c356,357
< printf "${usage_error_preamble} 'pki_bind_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_bind_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
356,357c360,361
< printf "${usage_error_preamble} 'pki_remove_data'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_remove_data'!\n"
> usage_errors=`expr ${usage_errors} + 1`
359,365c363,369
< if [ "${ca_token_password}" = "" ] ; then
< printf "${usage_error_preamble} 'ca_token_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
< fi
< if [ "${ca_backup_password}" = "" ] ; then
< printf "${usage_error_preamble} 'ca_backup_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ca_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_backup_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_backup_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
368,369c372,373
< printf "${usage_error_preamble} 'pki_email_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
372,373c376,377
< printf "${usage_error_preamble} 'pki_email_company'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_company'!\n"
> usage_errors=`expr ${usage_errors} + 1`
376,377c380,381
< printf "${usage_error_preamble} 'pki_email_domain'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_domain'!\n"
> usage_errors=`expr ${usage_errors} + 1`
380,381c384,385
< printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
393,395c397,399
< if [ ! -f "/var/lib/${ca_instance_name}/conf/CS.cfg" ] ; then
< printf "${existence_error_preamble} '${ca_instance_name}' EXISTS!\n"
< existence_errors=`expr ${existence_errors} + 1`
---
> if [ ! -f "/var/lib/${pki_ca_instance_name}/conf/CS.cfg" ] ; then
> printf "${existence_error_preamble} '${pki_ca_instance_name}' EXISTS!\n"
> existence_errors=`expr ${existence_errors} + 1`
397,402c401,406
< ca_configuration_check=`grep -c preop /var/lib/${ca_instance_name}/conf/CS.cfg`
< if [ ${ca_configuration_check} -eq 0 ] ; then
< printf "${configuration_error_preamble} '${ca_instance_name}' "
< printf "${configuration_error_postamble}\n"
< configuration_errors=`expr ${configuration_errors} + 1`
< fi
---
> ca_configuration_check=`grep -c preop /var/lib/${pki_ca_instance_name}/conf/CS.cfg`
> if [ ${ca_configuration_check} -eq 0 ] ; then
> printf "${configuration_error_preamble} '${pki_ca_instance_name}' "
> printf "${configuration_error_postamble}\n"
> configuration_errors=`expr ${configuration_errors} + 1`
> fi
406,412c410,416
< if [ ${usage_errors} -ne 0 ] ||
< [ ${existence_errors} -ne 0 ] ||
< [ ${configuration_errors} -ne 0 ] ; then
< printf "\n"
< printf "Please correct ALL errors listed above and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> if [ ${usage_errors} -ne 0 ] ||
> [ ${existence_errors} -ne 0 ] ||
> [ ${configuration_errors} -ne 0 ] ; then
> printf "\n"
> printf "Please correct ALL errors listed above and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
418,421c422,425
< printf "\n"
< printf "ERROR: Please install the 'pki-silent' package and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> printf "\n"
> printf "ERROR: Please install the 'pki-silent' package and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
426,438c430,439
< ## Instead, inform the user and exit this script.
< if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
< [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
< [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
< printf "\n"
< printf "WARNING: At least one of the security databases\n"
< printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
< exit 255
---
> ## Instead, just inform the user.
> if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
> [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
> [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
> printf "\n"
> printf "WARNING: The existing security databases\n"
> printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
442c443
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_ca_log}'
445,447c446,448
< printf " Removing old '${pki_silent_ca_log}' . . . "
< rm ${pki_silent_ca_log}
< printf "done.\n"
---
> printf " Removing old '${pki_silent_ca_log}' . . . "
> rm ${pki_silent_ca_log}
> printf "done.\n"
458,459c459,460
< ca_preop_pin=`cat /var/lib/${ca_instance_name}/conf/CS.cfg \
< | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
---
> ca_preop_pin=`cat /var/lib/${pki_ca_instance_name}/conf/CS.cfg \
> | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
468c469
< ## execute '/sbin/service ${ca_instance_name} status':
---
> ## execute '/sbin/service ${pki_ca_instance_name} status':
470c471
< ## ${ca_instance_name} (pid 7843) is running ...
---
> ## ${pki_ca_instance_name} (pid 7843) is running ...
488c489
< printf "'${pki_silent_script}': Configuring '${ca_instance_name}' . . .\n"
---
> printf "'${pki_silent_script}': Configuring '${pki_ca_instance_name}' . . .\n"
490,528c491,529
< -cs_hostname "${pki_ca_admin_host}" \
< -cs_port ${ca_admin_port} \
< -client_certdb_dir ${pki_silent_security_database_repository} \
< -client_certdb_pwd ${pki_silent_security_database_password} \
< -client_token_name ${pki_silent_security_token_name} \
< -preop_pin ${ca_preop_pin} \
< -domain_name "${pki_security_domain_name}" \
< -admin_user ${pki_silent_admin_user} \
< -admin_password ${pki_silent_admin_password} \
< -admin_email "${pki_silent_admin_email}" \
< -agent_name ${ca_agent_name} \
< -agent_key_size ${ca_agent_key_size} \
< -agent_key_type ${ca_agent_key_type} \
< -agent_cert_subject "${ca_agent_cert_subject}" \
< -ldap_host ${pki_ldap_host} \
< -ldap_port ${pki_ldap_port} \
< -bind_dn "${pki_bind_dn}" \
< -bind_password ${pki_bind_password} \
< -base_dn "${ca_base_dn}" \
< -db_name "${ca_db_name}" \
< -remove_data "${pki_remove_data}" \
< -key_size ${ca_key_size} \
< -key_type ${ca_key_type} \
< -key_algorithm ${ca_key_algorithm} \
< -signing_algorithm ${ca_signing_algorithm} \
< -signing_signingalgorithm ${ca_signing_signingalgorithm} \
< -ocsp_signing_signingalgorithm ${ca_ocsp_signing_signingalgorithm} \
< -save_p12 ${ca_save_p12} \
< -backup_pwd ${ca_backup_password} \
< -subsystem_name ${ca_subsystem_name} \
< -token_name ${ca_token_name} \
< -token_pwd ${ca_token_password} \
< -ca_sign_cert_subject_name "${ca_sign_cert_subject_name}" \
< -ca_subsystem_cert_subject_name "${ca_subsystem_cert_subject_name}" \
< -ca_ocsp_cert_subject_name "${ca_ocsp_cert_subject_name}" \
< -ca_server_cert_subject_name "${ca_server_cert_subject_name}" \
< -ca_audit_signing_cert_subject_name \
< "${ca_audit_signing_cert_subject_name}" \
< | tee ${pki_silent_ca_log}
---
> -cs_hostname "${pki_ca_admin_host}" \
> -cs_port ${pki_ca_admin_port} \
> -client_certdb_dir ${pki_silent_security_database_repository} \
> -client_certdb_pwd ${pki_silent_security_token_password} \
> -client_token_name ${pki_silent_security_token_name} \
> -preop_pin ${ca_preop_pin} \
> -domain_name "${pki_security_domain_name}" \
> -admin_user ${pki_silent_admin_user} \
> -admin_password ${pki_silent_admin_password} \
> -admin_email "${pki_silent_admin_email}" \
> -agent_name ${ca_agent_name} \
> -agent_key_size ${ca_agent_key_size} \
> -agent_key_type ${ca_agent_key_type} \
> -agent_cert_subject "${ca_agent_cert_subject}" \
> -ldap_host ${pki_ldap_host} \
> -ldap_port ${pki_ldap_port} \
> -bind_dn "${pki_bind_dn}" \
> -bind_password ${pki_bind_password} \
> -base_dn "${ca_base_dn}" \
> -db_name "${ca_db_name}" \
> -remove_data "${pki_remove_data}" \
> -key_size ${ca_key_size} \
> -key_type ${ca_key_type} \
> -key_algorithm ${ca_key_algorithm} \
> -signing_algorithm ${ca_signing_algorithm} \
> -signing_signingalgorithm ${ca_signing_signingalgorithm} \
> -ocsp_signing_signingalgorithm ${ca_ocsp_signing_signingalgorithm} \
> -save_p12 ${ca_save_p12} \
> -backup_pwd ${pki_ca_backup_password} \
> -subsystem_name ${pki_ca_subsystem_name} \
> -token_name ${pki_ca_token_name} \
> -token_pwd ${pki_ca_token_password} \
> -ca_sign_cert_subject_name "${ca_sign_cert_subject_name}" \
> -ca_subsystem_cert_subject_name "${ca_subsystem_cert_subject_name}" \
> -ca_ocsp_cert_subject_name "${ca_ocsp_cert_subject_name}" \
> -ca_server_cert_subject_name "${ca_server_cert_subject_name}" \
> -ca_audit_signing_cert_subject_name \
> "${ca_audit_signing_cert_subject_name}" \
> | tee ${pki_silent_ca_log}
531c532
< /sbin/service ${ca_instance_name} restart
---
> /sbin/service ${pki_ca_instance_name} restart
diff -r 20130410/pki/base/silent/templates/silent_kra_ip_port.template 20130413/pki/base/silent/templates/silent_kra_ip_port.template
17,33c17,35
< if [ "${pki_silent_script}" = "silent_kra_ip_port.template" ] ; then
< printf "\n"
< printf "Usage: (1) Install AND configure a directory server instance.\n\n"
< printf " (2) Install, but do NOT configure a\n"
< printf " 'default' PKI KRA subsystem instance\n"
< printf " using the IP Port Separation Mode.\n\n"
< printf " (3) Install the 'pki-silent' package.\n\n"
< printf " (4) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_default_pki_kra_ip_port_instance')\n\n"
< printf " (5) Fill in all MANDATORY user-defined variables\n"
< printf " in the new script.\n\n"
< printf " (6) Change any OPTIONAL user-defined variables\n"
< printf " in the new script as desired.\n\n"
< printf " (7) Become the 'root' user, and execute the new script to\n"
< printf " configure this 'default' PKI KRA subsystem instance.\n\n"
< exit 255
---
> if [ "${pki_silent_script}" = "silent_kra_ip_port.template" ] ; then
> printf "\n"
> printf "Usage: (1) Install AND configure a directory server instance.\n\n"
> printf " (2) Install AND configure a Root CA subsystem instance\n"
> printf " that is its own security domain.\n\n"
> printf " (3) Install, but do NOT configure a\n"
> printf " PKI KRA subsystem instance\n"
> printf " using the IP Port Separation Mode.\n\n"
> printf " (4) Install the 'pki-silent' package.\n\n"
> printf " (5) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_kra_ip_port_instance').\n\n"
> printf " (6) Fill in all MANDATORY user-defined variables\n"
> printf " in the new script.\n\n"
> printf " (7) Change any OPTIONAL user-defined variables\n"
> printf " in the new script as desired.\n\n"
> printf " (8) Become the 'root' user, and execute the new script to\n"
> printf " configure this PKI KRA subsystem instance.\n\n"
> exit 255
45,47c47,49
< MY_EUID=`/usr/bin/id -u`
< MY_UID=`/usr/bin/id -ur`
< USERNAME=`/usr/bin/id -un`
---
> MY_EUID=`/usr/bin/id -u`
> MY_UID=`/usr/bin/id -ur`
> USERNAME=`/usr/bin/id -un`
49,50c51,52
< printf "ERROR: Unsupported operating system '${OS}'!\n"
< exit 255
---
> printf "ERROR: Unsupported operating system '${OS}'!\n"
> exit 255
53,56c55,58
< if [ "${MY_UID}" != "${ROOTUID}" ] &&
< [ "${MY_EUID}" != "${ROOTUID}" ] ; then
< printf "ERROR: The '$0' script must be run as root!\n"
< exit 255
---
> if [ "${MY_UID}" != "${ROOTUID}" ] &&
> [ "${MY_EUID}" != "${ROOTUID}" ] ; then
> printf "ERROR: The '$0' script must be run as root!\n"
> exit 255
81c83
< ## PKI Subsystem Hosts (FQDN)
---
> ## PKI CA Subsystem Hosts (FQDN)
83a86,87
>
> ## PKI KRA Subsystem Hosts (FQDN)
87a92,126
> ##
> ## NOTE: Default PKI CA Instance Ports
> ##
> ## 9180 - non-secure port (not role specific)
> ## 9701 - non-secure Tomcat port
> ## 9443 - secure EE port
> ## 9444 - secure Agent port
> ## 9445 - secure Admin port
> ## 9446 - secure EE Client Auth port (not necessarily labeled)
> ##
> ## NOTE: Default PKI DRM Instance Ports
> ##
> ## 10180 - non-secure port (not role specific)
> ## 10701 - non-secure Tomcat port
> ## 10443 - secure EE port
> ## 10444 - secure Agent port
> ## 10445 - secure Admin port
> ##
> ## For Example:
> ##
> ## semanage port -l | grep pki
> ##
> ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445
> ## pki_kra_port_t tcp 10180, 10701, 10443, 10444, 10445
> ##
>
> ## PKI CA ports
> pki_ca_nonssl_port=
> pki_ca_ee_port=
> pki_ca_agent_port=
> pki_ca_admin_port=
>
> ## PKI DRM ports
> pki_kra_admin_port=
>
91c130
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
121,122c160,161
< ## For testing, however, it is often convenient to simply OVERWRITE any exiting
< ## data in the LDAP database. If this is desirable, set:
---
> ## For testing, however, it is often convenient to simply OVERWRITE any
> ## existing data in the LDAP database. If this is desirable, set:
130,131c169,170
< kra_token_name=internal
< kra_token_password=
---
> pki_kra_token_name=internal
> pki_kra_token_password=
135c174
< kra_backup_password=
---
> pki_kra_backup_password=
155,160d193
<
<
< ##############################################################################
< ## P R E - D E F I N E D " D E F A U L T " V A R I A B L E S ##
< ##############################################################################
<
162c195
< kra_subsystem_name="Data\ Recovery\ Manager"
---
> pki_kra_subsystem_name="Data\ Recovery\ Manager"
165c198
< kra_instance_name="pki-kra"
---
> pki_kra_instance_name="pki-kra"
167,206c200,201
< ##
< ## NOTE: Default CA Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ## *446 - secure EE Client Auth port
< ##
< ## NOTE: Default DRM Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ##
< ## For Example:
< ##
< ## semanage port -l | grep pki
< ##
< ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445, 9446
< ## pki_kra_port_t tcp 10180, 10701, 10443, 10444, 10445
< ##
<
< ## CA ports
< ca_nonssl_port=9180
< ca_agent_port=9443
< ca_ee_port=9444
< ca_admin_port=9445
< ca_ee_ca_port=9446
< ca_tomcat_server_port=9701
<
< ## DRM ports
< kra_nonssl_port=10180
< kra_agent_port=10443
< kra_ee_port=10444
< kra_admin_port=10445
< kra_tomcat_server_port=10701
---
> ## PKI Silent Log Files
> pki_silent_kra_log=/tmp/kra.log
214,217d208
< ## PKI Silent Log Files
< pki_silent_kra_log=/tmp/kra.log
<
<
228c219
< ## KRA Administrator of Instance ${kra_instance_name}'s
---
> ## KRA Administrator of Instance ${pki_kra_instance_name}'s
239c230
< ## + "${kra_instance_name}'s "
---
> ## + "${pki_kra_instance_name}'s "
242c233
< ## + "${kra_instance_name},"
---
> ## + "${pki_kra_instance_name},"
255,256c246,247
< ## "/var/lib/${kra_instance_name}/alias/" security libraries would be
< ## something similar to this:
---
> ## "/var/lib/${pki_kra_instance_name}/alias/" security libraries would
> ## be something similar to this:
261,266c252,257
< ## transportCert cert-${kra_instance_name} u,u,u
< ## Server-Cert cert-${kra_instance_name} u,u,u
< ## auditSigningCert cert-${kra_instance_name} u,u,u
< ## Certificate Authority - ${pki_security_domain_name} CT,c,
< ## storageCert cert-${kra_instance_name} u,u,u
< ## subsystemCert cert-${kra_instance_name} u,u,u
---
> ## transportCert cert-${pki_kra_instance_name} u,u,u
> ## Server-Cert cert-${pki_kra_instance_name} u,u,u
> ## auditSigningCert cert-${pki_kra_instance_name} u,u,u
> ## Certificate Authority - ${pki_security_domain_name} CT,c,
> ## storageCert cert-${pki_kra_instance_name} u,u,u
> ## subsystemCert cert-${pki_kra_instance_name} u,u,u
270c261
< ## Nickname: "transportCert cert-${kra_instance_name}"
---
> ## Nickname: "transportCert cert-${pki_kra_instance_name}"
274c265
< ## Nickname: "Server-Cert cert-${kra_instance_name}"
---
> ## Nickname: "Server-Cert cert-${pki_kra_instance_name}"
278c269
< ## Nickname: "auditSigningCert cert-${kra_instance_name}"
---
> ## Nickname: "auditSigningCert cert-${pki_kra_instance_name}"
287c278
< ## Nickname: "storageCert cert-${kra_instance_name}"
---
> ## Nickname: "storageCert cert-${pki_kra_instance_name}"
291c282
< ## Nickname: "subsystemCert cert-${kra_instance_name}"
---
> ## Nickname: "subsystemCert cert-${pki_kra_instance_name}"
296c287
< kra_agent_name="KRA\ Administrator\ of\ Instance\ ${kra_instance_name}\'s\ ${pki_security_domain_name}\ ID"
---
> kra_agent_name="KRA\ Administrator\ of\ Instance\ ${pki_kra_instance_name}\'s\ ${pki_security_domain_name}\ ID"
299,301c290,292
< kra_agent_cert_subject="cn=KRA\ Administrator\ of\ Instance\ ${kra_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
< kra_base_dn="dc=${pki_kra_admin_host}-${kra_instance_name}"
< kra_db_name="${pki_kra_admin_host}-${kra_instance_name}"
---
> kra_agent_cert_subject="cn=KRA\ Administrator\ of\ Instance\ ${pki_kra_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
> kra_base_dn="dc=${pki_kra_admin_host}-${pki_kra_instance_name}"
> kra_db_name="${pki_kra_admin_host}-${pki_kra_instance_name}"
329,330c320,321
< printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
333,334c324,325
< printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
337,338c328,329
< printf "${usage_error_preamble} 'pki_kra_agent_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_kra_agent_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
341,342c332,333
< printf "${usage_error_preamble} 'pki_kra_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_kra_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
345,346c336,337
< printf "${usage_error_preamble} 'pki_kra_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_kra_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
348,350c339,361
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ca_nonssl_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_nonssl_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_agent_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_agent_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_ee_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_ee_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_kra_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_kra_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
353,354c364,365
< printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
357,358c368,369
< printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
361,362c372,373
< printf "${usage_error_preamble} 'pki_ldap_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ldap_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
365,366c376,377
< printf "${usage_error_preamble} 'pki_bind_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_bind_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
369,370c380,381
< printf "${usage_error_preamble} 'pki_remove_data'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_remove_data'!\n"
> usage_errors=`expr ${usage_errors} + 1`
372,378c383,389
< if [ "${kra_token_password}" = "" ] ; then
< printf "${usage_error_preamble} 'kra_token_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
< fi
< if [ "${kra_backup_password}" = "" ] ; then
< printf "${usage_error_preamble} 'kra_backup_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_kra_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_kra_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_kra_backup_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_kra_backup_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
381,382c392,393
< printf "${usage_error_preamble} 'pki_email_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
385,386c396,397
< printf "${usage_error_preamble} 'pki_email_company'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_company'!\n"
> usage_errors=`expr ${usage_errors} + 1`
389,390c400,401
< printf "${usage_error_preamble} 'pki_email_domain'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_domain'!\n"
> usage_errors=`expr ${usage_errors} + 1`
393,394c404,405
< printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
406,408c417,419
< if [ ! -f "/var/lib/${kra_instance_name}/conf/CS.cfg" ] ; then
< printf "${existence_error_preamble} '${kra_instance_name}' EXISTS!\n"
< existence_errors=`expr ${existence_errors} + 1`
---
> if [ ! -f "/var/lib/${pki_kra_instance_name}/conf/CS.cfg" ] ; then
> printf "${existence_error_preamble} '${pki_kra_instance_name}' EXISTS!\n"
> existence_errors=`expr ${existence_errors} + 1`
410,415c421,426
< kra_configuration_check=`grep -c preop /var/lib/${kra_instance_name}/conf/CS.cfg`
< if [ ${kra_configuration_check} -eq 0 ] ; then
< printf "${configuration_error_preamble} '${kra_instance_name}' "
< printf "${configuration_error_postamble}\n"
< configuration_errors=`expr ${configuration_errors} + 1`
< fi
---
> kra_configuration_check=`grep -c preop /var/lib/${pki_kra_instance_name}/conf/CS.cfg`
> if [ ${kra_configuration_check} -eq 0 ] ; then
> printf "${configuration_error_preamble} '${pki_kra_instance_name}' "
> printf "${configuration_error_postamble}\n"
> configuration_errors=`expr ${configuration_errors} + 1`
> fi
419,425c430,436
< if [ ${usage_errors} -ne 0 ] ||
< [ ${existence_errors} -ne 0 ] ||
< [ ${configuration_errors} -ne 0 ] ; then
< printf "\n"
< printf "Please correct ALL errors listed above and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> if [ ${usage_errors} -ne 0 ] ||
> [ ${existence_errors} -ne 0 ] ||
> [ ${configuration_errors} -ne 0 ] ; then
> printf "\n"
> printf "Please correct ALL errors listed above and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
431,434c442,445
< printf "\n"
< printf "ERROR: Please install the 'pki-silent' package and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> printf "\n"
> printf "ERROR: Please install the 'pki-silent' package and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
439,451c450,459
< ## Instead, inform the user and exit this script.
< if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
< [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
< [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
< printf "\n"
< printf "WARNING: At least one of the security databases\n"
< printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
< exit 255
---
> ## Instead, just inform the user.
> if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
> [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
> [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
> printf "\n"
> printf "WARNING: The existing security databases\n"
> printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
455c463
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_kra_log}'
458,460c466,468
< printf " Removing old '${pki_silent_kra_log}' . . . "
< rm ${pki_silent_kra_log}
< printf "done.\n"
---
> printf " Removing old '${pki_silent_kra_log}' . . . "
> rm ${pki_silent_kra_log}
> printf "done.\n"
471,472c479,480
< kra_preop_pin=`cat /var/lib/${kra_instance_name}/conf/CS.cfg \
< | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
---
> kra_preop_pin=`cat /var/lib/${pki_kra_instance_name}/conf/CS.cfg \
> | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
481c489
< ## execute '/sbin/service ${kra_instance_name} status':
---
> ## execute '/sbin/service ${pki_kra_instance_name} status':
483c491
< ## ${kra_instance_name} (pid 11723) is running ...
---
> ## ${pki_kra_instance_name} (pid 11723) is running ...
500c508
< printf "'${pki_silent_script}': Configuring '${kra_instance_name}' . . .\n"
---
> printf "'${pki_silent_script}': Configuring '${pki_kra_instance_name}' . . .\n"
502,545c510,553
< -cs_hostname "${pki_kra_admin_host}" \
< -cs_port ${kra_admin_port} \
< -sd_hostname "${pki_security_domain_host}" \
< -sd_ssl_port ${ca_ee_port} \
< -sd_agent_port ${ca_agent_port} \
< -sd_admin_port ${ca_admin_port} \
< -sd_admin_name "${pki_security_domain_admin_name}" \
< -sd_admin_password ${pki_security_domain_admin_password} \
< -ca_hostname ${pki_ca_ee_host} \
< -ca_port ${ca_nonssl_port} \
< -ca_ssl_port ${ca_ee_port} \
< -client_certdb_dir ${pki_silent_security_database_repository} \
< -client_certdb_pwd ${pki_silent_security_database_password} \
< -client_token_name ${pki_silent_security_token_name} \
< -preop_pin ${kra_preop_pin} \
< -domain_name "${pki_security_domain_name}" \
< -admin_user ${pki_silent_admin_user} \
< -admin_password ${pki_silent_admin_password} \
< -admin_email "${pki_silent_admin_email}" \
< -agent_name ${kra_agent_name} \
< -ldap_host ${pki_ldap_host} \
< -ldap_port ${pki_ldap_port} \
< -bind_dn "${pki_bind_dn}" \
< -bind_password ${pki_bind_password} \
< -base_dn "${kra_base_dn}" \
< -db_name "${kra_db_name}" \
< -remove_data "${pki_remove_data}" \
< -key_size ${kra_key_size} \
< -key_type ${kra_key_type} \
< -token_name ${kra_token_name} \
< -token_pwd ${kra_token_password} \
< -agent_key_size ${kra_agent_key_size} \
< -agent_key_type ${kra_agent_key_type} \
< -agent_cert_subject "${kra_agent_cert_subject}" \
< -subsystem_name ${kra_subsystem_name} \
< -save_p12 ${kra_save_p12} \
< -backup_pwd ${kra_backup_password} \
< -drm_transport_cert_subject_name "${kra_transport_cert_subject_name}" \
< -drm_subsystem_cert_subject_name "${kra_subsystem_cert_subject_name}" \
< -drm_storage_cert_subject_name "${kra_storage_cert_subject_name}" \
< -drm_server_cert_subject_name "${kra_server_cert_subject_name}" \
< -drm_audit_signing_cert_subject_name \
< "${kra_audit_signing_cert_subject_name}" \
< | tee ${pki_silent_kra_log}
---
> -cs_hostname "${pki_kra_admin_host}" \
> -cs_port ${pki_kra_admin_port} \
> -sd_hostname "${pki_security_domain_host}" \
> -sd_ssl_port ${pki_ca_ee_port} \
> -sd_agent_port ${pki_ca_agent_port} \
> -sd_admin_port ${pki_ca_admin_port} \
> -sd_admin_name "${pki_security_domain_admin_name}" \
> -sd_admin_password ${pki_security_domain_admin_password} \
> -ca_hostname ${pki_ca_ee_host} \
> -ca_port ${pki_ca_nonssl_port} \
> -ca_ssl_port ${pki_ca_ee_port} \
> -client_certdb_dir ${pki_silent_security_database_repository} \
> -client_certdb_pwd ${pki_silent_security_token_password} \
> -client_token_name ${pki_silent_security_token_name} \
> -preop_pin ${kra_preop_pin} \
> -domain_name "${pki_security_domain_name}" \
> -admin_user ${pki_silent_admin_user} \
> -admin_password ${pki_silent_admin_password} \
> -admin_email "${pki_silent_admin_email}" \
> -agent_name ${kra_agent_name} \
> -ldap_host ${pki_ldap_host} \
> -ldap_port ${pki_ldap_port} \
> -bind_dn "${pki_bind_dn}" \
> -bind_password ${pki_bind_password} \
> -base_dn "${kra_base_dn}" \
> -db_name "${kra_db_name}" \
> -remove_data "${pki_remove_data}" \
> -key_size ${kra_key_size} \
> -key_type ${kra_key_type} \
> -token_name ${pki_kra_token_name} \
> -token_pwd ${pki_kra_token_password} \
> -agent_key_size ${kra_agent_key_size} \
> -agent_key_type ${kra_agent_key_type} \
> -agent_cert_subject "${kra_agent_cert_subject}" \
> -subsystem_name ${pki_kra_subsystem_name} \
> -save_p12 ${kra_save_p12} \
> -backup_pwd ${pki_kra_backup_password} \
> -drm_transport_cert_subject_name "${kra_transport_cert_subject_name}" \
> -drm_subsystem_cert_subject_name "${kra_subsystem_cert_subject_name}" \
> -drm_storage_cert_subject_name "${kra_storage_cert_subject_name}" \
> -drm_server_cert_subject_name "${kra_server_cert_subject_name}" \
> -drm_audit_signing_cert_subject_name \
> "${kra_audit_signing_cert_subject_name}" \
> | tee ${pki_silent_kra_log}
548c556
< /sbin/service ${kra_instance_name} restart
---
> /sbin/service ${pki_kra_instance_name} restart
diff -r 20130410/pki/base/silent/templates/silent_ocsp_ip_port.template 20130413/pki/base/silent/templates/silent_ocsp_ip_port.template
17,33c17,35
< if [ "${pki_silent_script}" = "silent_ocsp_ip_port.template" ] ; then
< printf "\n"
< printf "Usage: (1) Install AND configure a directory server instance.\n\n"
< printf " (2) Install, but do NOT configure a\n"
< printf " 'default' PKI OCSP instance\n"
< printf " using the IP Port Separation Mode.\n\n"
< printf " (3) Install the 'pki-silent' package.\n\n"
< printf " (4) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_default_pki_ocsp_ip_port_instance')\n\n"
< printf " (5) Fill in all MANDATORY user-defined variables\n"
< printf " in the new script.\n\n"
< printf " (6) Change any OPTIONAL user-defined variables\n"
< printf " in the new script as desired.\n\n"
< printf " (7) Become the 'root' user, and execute the new script to\n"
< printf " configure this 'default' PKI OCSP subsystem instance.\n\n"
< exit 255
---
> if [ "${pki_silent_script}" = "silent_ocsp_ip_port.template" ] ; then
> printf "\n"
> printf "Usage: (1) Install AND configure a directory server instance.\n\n"
> printf " (2) Install AND configure a Root CA subsystem instance\n"
> printf " that is its own security domain.\n\n"
> printf " (3) Install, but do NOT configure a\n"
> printf " PKI OCSP instance\n"
> printf " using the IP Port Separation Mode.\n\n"
> printf " (4) Install the 'pki-silent' package.\n\n"
> printf " (5) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_ocsp_ip_port_instance').\n\n"
> printf " (6) Fill in all MANDATORY user-defined variables\n"
> printf " in the new script.\n\n"
> printf " (7) Change any OPTIONAL user-defined variables\n"
> printf " in the new script as desired.\n\n"
> printf " (8) Become the 'root' user, and execute the new script to\n"
> printf " configure this PKI OCSP subsystem instance.\n\n"
> exit 255
45,47c47,49
< MY_EUID=`/usr/bin/id -u`
< MY_UID=`/usr/bin/id -ur`
< USERNAME=`/usr/bin/id -un`
---
> MY_EUID=`/usr/bin/id -u`
> MY_UID=`/usr/bin/id -ur`
> USERNAME=`/usr/bin/id -un`
49,50c51,52
< printf "ERROR: Unsupported operating system '${OS}'!\n"
< exit 255
---
> printf "ERROR: Unsupported operating system '${OS}'!\n"
> exit 255
53,56c55,58
< if [ "${MY_UID}" != "${ROOTUID}" ] &&
< [ "${MY_EUID}" != "${ROOTUID}" ] ; then
< printf "ERROR: The '$0' script must be run as root!\n"
< exit 255
---
> if [ "${MY_UID}" != "${ROOTUID}" ] &&
> [ "${MY_EUID}" != "${ROOTUID}" ] ; then
> printf "ERROR: The '$0' script must be run as root!\n"
> exit 255
81c83
< ## PKI Subsystem Hosts (FQDN)
---
> ## PKI CA Subsystem Hosts (FQDN)
84c86,87
< pki_ocsp_agent_host=
---
>
> ## PKI OCSP Subsystem Hosts (FQDN)
85a89
> pki_ocsp_agent_host=
87a92,126
> ##
> ## NOTE: Default PKI CA Instance Ports
> ##
> ## 9180 - non-secure port (not role specific)
> ## 9701 - non-secure Tomcat port
> ## 9443 - secure EE port
> ## 9444 - secure Agent port
> ## 9445 - secure Admin port
> ## 9446 - secure EE Client Auth port (not necessarily labeled)
> ##
> ## NOTE: Default PKI OCSP Instance Ports
> ##
> ## 11180 - non-secure port (not role specific)
> ## 11701 - non-secure Tomcat port
> ## 11443 - secure EE port
> ## 11444 - secure Agent port
> ## 11445 - secure Admin port
> ##
> ## For Example:
> ##
> ## semanage port -l | grep pki
> ##
> ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445
> ## pki_ocsp_port_t tcp 11180, 11701, 11443, 11444, 11445
> ##
>
> ## PKI CA ports
> pki_ca_nonssl_port=
> pki_ca_ee_port=
> pki_ca_agent_port=
> pki_ca_admin_port=
>
> ## PKI OCSP ports
> pki_ocsp_admin_port=
>
91c130
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
121,122c160,161
< ## For testing, however, it is often convenient to simply OVERWRITE any exiting
< ## data in the LDAP database. If this is desirable, set:
---
> ## For testing, however, it is often convenient to simply OVERWRITE any
> ## existing data in the LDAP database. If this is desirable, set:
130,131c169,170
< ocsp_token_name=internal
< ocsp_token_password=
---
> pki_ocsp_token_name=internal
> pki_ocsp_token_password=
135c174
< ocsp_backup_password=
---
> pki_ocsp_backup_password=
155,160d193
<
<
< ##############################################################################
< ## P R E - D E F I N E D " D E F A U L T " V A R I A B L E S ##
< ##############################################################################
<
162c195
< ocsp_subsystem_name="OCSP\ Responder"
---
> pki_ocsp_subsystem_name="OCSP\ Responder"
165c198
< ocsp_instance_name="pki-ocsp"
---
> pki_ocsp_instance_name="pki-ocsp"
167,206c200,201
< ##
< ## NOTE: Default CA Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ## *446 - secure EE Client Auth port
< ##
< ## NOTE: Default OCSP Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ##
< ## For Example:
< ##
< ## semanage port -l | grep pki
< ##
< ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445, 9446
< ## pki_ocsp_port_t tcp 11180, 11701, 11443, 11444, 11445
< ##
<
< ## CA ports
< ca_nonssl_port=9180
< ca_agent_port=9443
< ca_ee_port=9444
< ca_admin_port=9445
< ca_ee_ca_port=9446
< ca_tomcat_server_port=9701
<
< ## OCSP ports
< ocsp_nonssl_port=11180
< ocsp_agent_port=11443
< ocsp_ee_port=11444
< ocsp_admin_port=11445
< ocsp_tomcat_server_port=11701
---
> ## PKI Silent Log Files
> pki_silent_ocsp_log=/tmp/ocsp.log
214,217d208
< ## PKI Silent Log Files
< pki_silent_ocsp_log=/tmp/ocsp.log
<
<
228c219
< ## OCSP Administrator of Instance ${ocsp_instance_name}'s
---
> ## OCSP Administrator of Instance ${pki_ocsp_instance_name}'s
239c230
< ## + "${ocsp_instance_name}'s "
---
> ## + "${pki_ocsp_instance_name}'s "
242c233
< ## + "${ocsp_instance_name},"
---
> ## + "${pki_ocsp_instance_name},"
255,256c246,247
< ## "/var/lib/${ocsp_instance_name}/alias/" security libraries would be
< ## something similar to this:
---
> ## "/var/lib/${pki_ocsp_instance_name}/alias/" security libraries would
> ## be something similar to this:
261,262c252,253
< ## ocspSigningCert cert-${ocsp_instance_name} CTu,Cu,Cu
< ## subsystemCert cert-${ocsp_instance_name} u,u,u
---
> ## ocspSigningCert cert-${pki_ocsp_instance_name} CTu,Cu,Cu
> ## subsystemCert cert-${pki_ocsp_instance_name} u,u,u
264,265c255,256
< ## Server-Cert cert-${ocsp_instance_name} u,u,u
< ## auditSigningCert cert-${ocsp_instance_name} u,u,u
---
> ## Server-Cert cert-${pki_ocsp_instance_name} u,u,u
> ## auditSigningCert cert-${pki_ocsp_instance_name} u,u,u
269c260
< ## Nickname: "ocspSigningCert cert-${ocsp_instance_name}"
---
> ## Nickname: "ocspSigningCert cert-${pki_ocsp_instance_name}"
273c264
< ## Nickname: "subsystemCert cert-${ocsp_instance_name}"
---
> ## Nickname: "subsystemCert cert-${pki_ocsp_instance_name}"
282c273
< ## Nickname: "Server-Cert cert-${ocsp_instance_name}"
---
> ## Nickname: "Server-Cert cert-${pki_ocsp_instance_name}"
286c277
< ## Nickname: "auditSigningCert cert-${ocsp_instance_name}"
---
> ## Nickname: "auditSigningCert cert-${pki_ocsp_instance_name}"
291c282
< ocsp_agent_name="OCSP\ Administrator\ of\ Instance\ ${ocsp_instance_name}\'s\ ${pki_security_domain_name}\ ID"
---
> ocsp_agent_name="OCSP\ Administrator\ of\ Instance\ ${pki_ocsp_instance_name}\'s\ ${pki_security_domain_name}\ ID"
294,296c285,287
< ocsp_agent_cert_subject="cn=OCSP\ Administrator\ of\ Instance\ ${ocsp_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
< ocsp_base_dn="dc=${pki_ocsp_admin_host}-${ocsp_instance_name}"
< ocsp_db_name="${pki_ocsp_admin_host}-${ocsp_instance_name}"
---
> ocsp_agent_cert_subject="cn=OCSP\ Administrator\ of\ Instance\ ${pki_ocsp_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
> ocsp_base_dn="dc=${pki_ocsp_admin_host}-${pki_ocsp_instance_name}"
> ocsp_db_name="${pki_ocsp_admin_host}-${pki_ocsp_instance_name}"
325,326c316,317
< printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
329,330c320,321
< printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
333,334c324,325
< printf "${usage_error_preamble} 'pki_ocsp_agent_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ocsp_agent_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
337,338c328,329
< printf "${usage_error_preamble} 'pki_ocsp_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ocsp_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
341,342c332,333
< printf "${usage_error_preamble} 'pki_ocsp_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ocsp_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
344,346c335,357
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ca_nonssl_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_nonssl_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_agent_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_agent_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_ee_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_ee_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ocsp_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ocsp_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
349,350c360,361
< printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
353,354c364,365
< printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
357,358c368,369
< printf "${usage_error_preamble} 'pki_ldap_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ldap_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
361,362c372,373
< printf "${usage_error_preamble} 'pki_bind_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_bind_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
365,366c376,377
< printf "${usage_error_preamble} 'pki_remove_data'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_remove_data'!\n"
> usage_errors=`expr ${usage_errors} + 1`
368,374c379,385
< if [ "${ocsp_token_password}" = "" ] ; then
< printf "${usage_error_preamble} 'ocsp_token_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
< fi
< if [ "${ocsp_backup_password}" = "" ] ; then
< printf "${usage_error_preamble} 'ocsp_backup_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ocsp_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ocsp_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ocsp_backup_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ocsp_backup_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
377,378c388,389
< printf "${usage_error_preamble} 'pki_email_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
381,382c392,393
< printf "${usage_error_preamble} 'pki_email_company'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_company'!\n"
> usage_errors=`expr ${usage_errors} + 1`
385,386c396,397
< printf "${usage_error_preamble} 'pki_email_domain'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_domain'!\n"
> usage_errors=`expr ${usage_errors} + 1`
389,390c400,401
< printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
402,404c413,415
< if [ ! -f "/var/lib/${ocsp_instance_name}/conf/CS.cfg" ] ; then
< printf "${existence_error_preamble} '${ocsp_instance_name}' EXISTS!\n"
< existence_errors=`expr ${existence_errors} + 1`
---
> if [ ! -f "/var/lib/${pki_ocsp_instance_name}/conf/CS.cfg" ] ; then
> printf "${existence_error_preamble} '${pki_ocsp_instance_name}' EXISTS!\n"
> existence_errors=`expr ${existence_errors} + 1`
406,411c417,422
< ocsp_configuration_check=`grep -c preop /var/lib/${ocsp_instance_name}/conf/CS.cfg`
< if [ ${ocsp_configuration_check} -eq 0 ] ; then
< printf "${configuration_error_preamble} '${ocsp_instance_name}' "
< printf "${configuration_error_postamble}\n"
< configuration_errors=`expr ${configuration_errors} + 1`
< fi
---
> ocsp_configuration_check=`grep -c preop /var/lib/${pki_ocsp_instance_name}/conf/CS.cfg`
> if [ ${ocsp_configuration_check} -eq 0 ] ; then
> printf "${configuration_error_preamble} '${pki_ocsp_instance_name}' "
> printf "${configuration_error_postamble}\n"
> configuration_errors=`expr ${configuration_errors} + 1`
> fi
415,421c426,432
< if [ ${usage_errors} -ne 0 ] ||
< [ ${existence_errors} -ne 0 ] ||
< [ ${configuration_errors} -ne 0 ] ; then
< printf "\n"
< printf "Please correct ALL errors listed above and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> if [ ${usage_errors} -ne 0 ] ||
> [ ${existence_errors} -ne 0 ] ||
> [ ${configuration_errors} -ne 0 ] ; then
> printf "\n"
> printf "Please correct ALL errors listed above and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
427,430c438,441
< printf "\n"
< printf "ERROR: Please install the 'pki-silent' package and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> printf "\n"
> printf "ERROR: Please install the 'pki-silent' package and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
435,447c446,455
< ## Instead, inform the user and exit this script.
< if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
< [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
< [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
< printf "\n"
< printf "WARNING: At least one of the security databases\n"
< printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
< exit 255
---
> ## Instead, just inform the user.
> if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
> [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
> [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
> printf "\n"
> printf "WARNING: The existing security databases\n"
> printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
451c459
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_ocsp_log}'
454,456c462,464
< printf " Removing old '${pki_silent_ocsp_log}' . . . "
< rm ${pki_silent_ocsp_log}
< printf "done.\n"
---
> printf " Removing old '${pki_silent_ocsp_log}' . . . "
> rm ${pki_silent_ocsp_log}
> printf "done.\n"
467,468c475,476
< ocsp_preop_pin=`cat /var/lib/${ocsp_instance_name}/conf/CS.cfg \
< | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
---
> ocsp_preop_pin=`cat /var/lib/${pki_ocsp_instance_name}/conf/CS.cfg \
> | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
477c485
< ## execute '/sbin/service ${ocsp_instance_name} status':
---
> ## execute '/sbin/service ${pki_ocsp_instance_name} status':
479c487
< ## ${ocsp_instance_name} (pid 13058) is running ...
---
> ## ${pki_ocsp_instance_name} (pid 13058) is running ...
490c498
< printf "'${pki_silent_script}': Configuring '${ocsp_instance_name}' . . .\n"
---
> printf "'${pki_silent_script}': Configuring '${pki_ocsp_instance_name}' . . .\n"
492,534c500,542
< -cs_hostname "${pki_ocsp_admin_host}" \
< -cs_port ${ocsp_admin_port} \
< -sd_hostname "${pki_security_domain_host}" \
< -sd_ssl_port ${ca_ee_port} \
< -sd_agent_port ${ca_agent_port} \
< -sd_admin_port ${ca_admin_port} \
< -sd_admin_name "${pki_security_domain_admin_name}" \
< -sd_admin_password ${pki_security_domain_admin_password} \
< -ca_hostname ${pki_ca_ee_host} \
< -ca_port ${ca_nonssl_port} \
< -ca_ssl_port ${ca_ee_port} \
< -client_certdb_dir ${pki_silent_security_database_repository} \
< -client_certdb_pwd ${pki_silent_security_database_password} \
< -client_token_name ${pki_silent_security_token_name} \
< -preop_pin ${ocsp_preop_pin} \
< -domain_name "${pki_security_domain_name}" \
< -admin_user ${pki_silent_admin_user} \
< -admin_password ${pki_silent_admin_password} \
< -admin_email "${pki_silent_admin_email}" \
< -agent_name ${ocsp_agent_name} \
< -ldap_host ${pki_ldap_host} \
< -ldap_port ${pki_ldap_port} \
< -bind_dn "${pki_bind_dn}" \
< -bind_password ${pki_bind_password} \
< -base_dn "${ocsp_base_dn}" \
< -db_name "${ocsp_db_name}" \
< -remove_data "${pki_remove_data}" \
< -key_size ${ocsp_key_size} \
< -key_type ${ocsp_key_type} \
< -token_name ${ocsp_token_name} \
< -token_pwd ${ocsp_token_password} \
< -agent_key_size ${ocsp_agent_key_size} \
< -agent_key_type ${ocsp_agent_key_type} \
< -agent_cert_subject "${ocsp_agent_cert_subject}" \
< -subsystem_name ${ocsp_subsystem_name} \
< -save_p12 ${ocsp_save_p12} \
< -backup_pwd ${ocsp_backup_password} \
< -ocsp_sign_cert_subject_name "${ocsp_sign_cert_subject_name}" \
< -ocsp_subsystem_cert_subject_name "${ocsp_subsystem_cert_subject_name}" \
< -ocsp_server_cert_subject_name "${ocsp_server_cert_subject_name}" \
< -ocsp_audit_signing_cert_subject_name \
< "${ocsp_audit_signing_cert_subject_name}" \
< | tee ${pki_silent_ocsp_log}
---
> -cs_hostname "${pki_ocsp_admin_host}" \
> -cs_port ${pki_ocsp_admin_port} \
> -sd_hostname "${pki_security_domain_host}" \
> -sd_ssl_port ${pki_ca_ee_port} \
> -sd_agent_port ${pki_ca_agent_port} \
> -sd_admin_port ${pki_ca_admin_port} \
> -sd_admin_name "${pki_security_domain_admin_name}" \
> -sd_admin_password ${pki_security_domain_admin_password} \
> -ca_hostname ${pki_ca_ee_host} \
> -ca_port ${pki_ca_nonssl_port} \
> -ca_ssl_port ${pki_ca_ee_port} \
> -client_certdb_dir ${pki_silent_security_database_repository} \
> -client_certdb_pwd ${pki_silent_security_token_password} \
> -client_token_name ${pki_silent_security_token_name} \
> -preop_pin ${ocsp_preop_pin} \
> -domain_name "${pki_security_domain_name}" \
> -admin_user ${pki_silent_admin_user} \
> -admin_password ${pki_silent_admin_password} \
> -admin_email "${pki_silent_admin_email}" \
> -agent_name ${ocsp_agent_name} \
> -ldap_host ${pki_ldap_host} \
> -ldap_port ${pki_ldap_port} \
> -bind_dn "${pki_bind_dn}" \
> -bind_password ${pki_bind_password} \
> -base_dn "${ocsp_base_dn}" \
> -db_name "${ocsp_db_name}" \
> -remove_data "${pki_remove_data}" \
> -key_size ${ocsp_key_size} \
> -key_type ${ocsp_key_type} \
> -token_name ${pki_ocsp_token_name} \
> -token_pwd ${pki_ocsp_token_password} \
> -agent_key_size ${ocsp_agent_key_size} \
> -agent_key_type ${ocsp_agent_key_type} \
> -agent_cert_subject "${ocsp_agent_cert_subject}" \
> -subsystem_name ${pki_ocsp_subsystem_name} \
> -save_p12 ${ocsp_save_p12} \
> -backup_pwd ${pki_ocsp_backup_password} \
> -ocsp_sign_cert_subject_name "${ocsp_sign_cert_subject_name}" \
> -ocsp_subsystem_cert_subject_name "${ocsp_subsystem_cert_subject_name}" \
> -ocsp_server_cert_subject_name "${ocsp_server_cert_subject_name}" \
> -ocsp_audit_signing_cert_subject_name \
> "${ocsp_audit_signing_cert_subject_name}" \
> | tee ${pki_silent_ocsp_log}
537c545
< /sbin/service ${ocsp_instance_name} restart
---
> /sbin/service ${pki_ocsp_instance_name} restart
Only in 20130413/pki/base/silent/templates: silent_ra_to_ip_port.template
diff -r 20130410/pki/base/silent/templates/silent_tks_ip_port.template 20130413/pki/base/silent/templates/silent_tks_ip_port.template
17,33c17,35
< if [ "${pki_silent_script}" = "silent_tks_ip_port.template" ] ; then
< printf "\n"
< printf "Usage: (1) Install AND configure a directory server instance.\n\n"
< printf " (2) Install, but do NOT configure a\n"
< printf " 'default' PKI TKS instance\n"
< printf " using the IP Port Separation Mode.\n\n"
< printf " (3) Install the 'pki-silent' package.\n\n"
< printf " (4) Copy '$0' to a new script name\n"
< printf " without the '.template' extension.\n"
< printf " (e .g. - 'configure_default_pki_tks_ip_port_instance')\n\n"
< printf " (5) Fill in all MANDATORY user-defined variables\n"
< printf " in the new script.\n\n"
< printf " (6) Change any OPTIONAL user-defined variables\n"
< printf " in the new script as desired.\n\n"
< printf " (7) Become the 'root' user, and execute the new script to\n"
< printf " configure this 'default' PKI TKS subsystem instance.\n\n"
< exit 255
---
> if [ "${pki_silent_script}" = "silent_tks_ip_port.template" ] ; then
> printf "\n"
> printf "Usage: (1) Install AND configure a directory server instance.\n\n"
> printf " (2) Install AND configure a Root CA subsystem instance\n"
> printf " that is its own security domain.\n\n"
> printf " (3) Install, but do NOT configure a\n"
> printf " PKI TKS instance\n"
> printf " using the IP Port Separation Mode.\n\n"
> printf " (4) Install the 'pki-silent' package.\n\n"
> printf " (5) Copy '$0' to a new script name\n"
> printf " without the '.template' extension\n"
> printf " (e .g. - 'configure_tks_ip_port_instance').\n\n"
> printf " (6) Fill in all MANDATORY user-defined variables\n"
> printf " in the new script.\n\n"
> printf " (7) Change any OPTIONAL user-defined variables\n"
> printf " in the new script as desired.\n\n"
> printf " (8) Become the 'root' user, and execute the new script to\n"
> printf " configure this PKI TKS subsystem instance.\n\n"
> exit 255
45,47c47,49
< MY_EUID=`/usr/bin/id -u`
< MY_UID=`/usr/bin/id -ur`
< USERNAME=`/usr/bin/id -un`
---
> MY_EUID=`/usr/bin/id -u`
> MY_UID=`/usr/bin/id -ur`
> USERNAME=`/usr/bin/id -un`
49,50c51,52
< printf "ERROR: Unsupported operating system '${OS}'!\n"
< exit 255
---
> printf "ERROR: Unsupported operating system '${OS}'!\n"
> exit 255
53,56c55,58
< if [ "${MY_UID}" != "${ROOTUID}" ] &&
< [ "${MY_EUID}" != "${ROOTUID}" ] ; then
< printf "ERROR: The '$0' script must be run as root!\n"
< exit 255
---
> if [ "${MY_UID}" != "${ROOTUID}" ] &&
> [ "${MY_EUID}" != "${ROOTUID}" ] ; then
> printf "ERROR: The '$0' script must be run as root!\n"
> exit 255
81c83
< ## PKI Subsystem Hosts (FQDN)
---
> ## PKI CA Subsystem Hosts (FQDN)
83a86,87
>
> ## PKI TKS Subsystem Hosts (FQDN)
87a92,126
> ##
> ## NOTE: Default PKI CA Instance Ports
> ##
> ## 9180 - non-secure port (not role specific)
> ## 9701 - non-secure Tomcat port
> ## 9443 - secure EE port
> ## 9444 - secure Agent port
> ## 9445 - secure Admin port
> ## 9446 - secure EE Client Auth port (not necessarily labeled)
> ##
> ## NOTE: Default PKI TKS Instance Ports
> ##
> ## 13180 - non-secure port (not role specific)
> ## 13701 - non-secure Tomcat port
> ## 13443 - secure EE port
> ## 13444 - secure Agent port
> ## 13445 - secure Admin port
> ##
> ## For Example:
> ##
> ## semanage port -l | grep pki
> ##
> ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445
> ## pki_tks_port_t tcp 13180, 13701, 13443, 13444, 13445
> ##
>
> ## PKI CA ports
> pki_ca_nonssl_port=
> pki_ca_ee_port=
> pki_ca_agent_port=
> pki_ca_admin_port=
>
> ## PKI TKS ports
> pki_tks_admin_port=
>
91c130
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
120,121c159,160
< ## For testing, however, it is often convenient to simply OVERWRITE any exiting
< ## data in the LDAP database. If this is desirable, set:
---
> ## For testing, however, it is often convenient to simply OVERWRITE any
> ## existing data in the LDAP database. If this is desirable, set:
129,130c168,169
< tks_token_name=internal
< tks_token_password=
---
> pki_tks_token_name=internal
> pki_tks_token_password=
134c173
< tks_backup_password=
---
> pki_tks_backup_password=
154,159d192
<
<
< ##############################################################################
< ## P R E - D E F I N E D " D E F A U L T " V A R I A B L E S ##
< ##############################################################################
<
161c194
< tks_subsystem_name="Token\ Key\ Service"
---
> pki_tks_subsystem_name="Token\ Key\ Service"
164c197
< tks_instance_name="pki-tks"
---
> pki_tks_instance_name="pki-tks"
166,205c199,200
< ##
< ## NOTE: Default CA Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ## *446 - secure EE Client Auth port
< ##
< ## NOTE: Default TKS Instance Ports
< ##
< ## *180 - non-secure port (not role specific)
< ## *701 - non-secure Tomcat port
< ## *443 - secure EE port
< ## *444 - secure Agent port
< ## *445 - secure Admin port
< ##
< ## For Example:
< ##
< ## semanage port -l | grep pki
< ##
< ## pki_ca_port_t tcp 9180, 9701, 9443, 9444, 9445, 9446
< ## pki_tks_port_t tcp 13180, 13701, 13443, 13444, 13445
< ##
<
< ## CA ports
< ca_nonssl_port=9180
< ca_agent_port=9443
< ca_ee_port=9444
< ca_admin_port=9445
< ca_ee_ca_port=9446
< ca_tomcat_server_port=9701
<
< ## TKS ports
< tks_nonssl_port=13180
< tks_agent_port=13443
< tks_ee_port=13444
< tks_admin_port=13445
< tks_tomcat_server_port=13701
---
> ## PKI Silent Log Files
> pki_silent_tks_log=/tmp/tks.log
213,216d207
< ## PKI Silent Log Files
< pki_silent_tks_log=/tmp/tks.log
<
<
227c218
< ## TKS Administrator of Instance ${tks_instance_name}'s
---
> ## TKS Administrator of Instance ${pki_tks_instance_name}'s
238c229
< ## + "${tks_instance_name}'s "
---
> ## + "${pki_tks_instance_name}'s "
241c232
< ## + "${tks_instance_name},"
---
> ## + "${pki_tks_instance_name},"
254,255c245,246
< ## "/var/lib/${tks_instance_name}/alias/" security libraries would be
< ## something similar to this:
---
> ## "/var/lib/${pki_tks_instance_name}/alias/" security libraries would
> ## be something similar to this:
260c251
< ## subsystemCert cert-${tks_instance_name} u,u,u
---
> ## subsystemCert cert-${pki_tks_instance_name} u,u,u
263,264c254,255
< ## Server-Cert cert-${tks_instance_name} u,u,u
< ## auditSigningCert cert-${tks_instance_name} u,u,u
---
> ## Server-Cert cert-${pki_tks_instance_name} u,u,u
> ## auditSigningCert cert-${pki_tks_instance_name} u,u,u
268c259
< ## Nickname: "subsystemCert cert-${tks_instance_name}"
---
> ## Nickname: "subsystemCert cert-${pki_tks_instance_name}"
282c273
< ## Nickname: "Server-Cert cert-${tks_instance_name}"
---
> ## Nickname: "Server-Cert cert-${pki_tks_instance_name}"
286c277
< ## Nickname: "auditSigningCert cert-${tks_instance_name}"
---
> ## Nickname: "auditSigningCert cert-${pki_tks_instance_name}"
291c282
< tks_agent_name="TKS\ Administrator\ of\ Instance\ ${tks_instance_name}\'s\ ${pki_security_domain_name}\ ID"
---
> tks_agent_name="TKS\ Administrator\ of\ Instance\ ${pki_tks_instance_name}\'s\ ${pki_security_domain_name}\ ID"
294,296c285,287
< tks_agent_cert_subject="cn=TKS\ Administrator\ of\ Instance\ ${tks_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
< tks_base_dn="dc=${pki_tks_admin_host}-${tks_instance_name}"
< tks_db_name="${pki_tks_admin_host}-${tks_instance_name}"
---
> tks_agent_cert_subject="cn=TKS\ Administrator\ of\ Instance\ ${pki_tks_instance_name},uid=admin,e=${pki_silent_admin_email},o=${pki_security_domain_name}"
> tks_base_dn="dc=${pki_tks_admin_host}-${pki_tks_instance_name}"
> tks_db_name="${pki_tks_admin_host}-${pki_tks_instance_name}"
323,324c314,315
< printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
327,328c318,319
< printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ca_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
331,332c322,323
< printf "${usage_error_preamble} 'pki_tks_agent_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_tks_agent_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
335,336c326,327
< printf "${usage_error_preamble} 'pki_tks_ee_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_tks_ee_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
339,340c330,331
< printf "${usage_error_preamble} 'pki_tks_admin_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_tks_admin_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
342,344c333,355
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_ca_nonssl_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_nonssl_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_agent_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_agent_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_ee_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_ee_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_ca_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_ca_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_tks_admin_port}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_tks_admin_port'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
347,348c358,359
< printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
351,352c362,363
< printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_security_domain_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
355,356c366,367
< printf "${usage_error_preamble} 'pki_ldap_host'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_ldap_host'!\n"
> usage_errors=`expr ${usage_errors} + 1`
359,360c370,371
< printf "${usage_error_preamble} 'pki_bind_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_bind_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
363,364c374,375
< printf "${usage_error_preamble} 'pki_remove_data'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_remove_data'!\n"
> usage_errors=`expr ${usage_errors} + 1`
366,372c377,383
< if [ "${tks_token_password}" = "" ] ; then
< printf "${usage_error_preamble} 'tks_token_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
< fi
< if [ "${tks_backup_password}" = "" ] ; then
< printf "${usage_error_preamble} 'tks_backup_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> if [ "${pki_tks_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_tks_token_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
> fi
> if [ "${pki_tks_backup_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_tks_backup_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
375,376c386,387
< printf "${usage_error_preamble} 'pki_email_name'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_name'!\n"
> usage_errors=`expr ${usage_errors} + 1`
379,380c390,391
< printf "${usage_error_preamble} 'pki_email_company'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_company'!\n"
> usage_errors=`expr ${usage_errors} + 1`
383,384c394,395
< printf "${usage_error_preamble} 'pki_email_domain'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_email_domain'!\n"
> usage_errors=`expr ${usage_errors} + 1`
387,388c398,399
< printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
< usage_errors=`expr ${usage_errors} + 1`
---
> printf "${usage_error_preamble} 'pki_silent_admin_password'!\n"
> usage_errors=`expr ${usage_errors} + 1`
400,402c411,413
< if [ ! -f "/var/lib/${tks_instance_name}/conf/CS.cfg" ] ; then
< printf "${existence_error_preamble} '${tks_instance_name}' EXISTS!\n"
< existence_errors=`expr ${existence_errors} + 1`
---
> if [ ! -f "/var/lib/${pki_tks_instance_name}/conf/CS.cfg" ] ; then
> printf "${existence_error_preamble} '${pki_tks_instance_name}' EXISTS!\n"
> existence_errors=`expr ${existence_errors} + 1`
404,409c415,420
< tks_configuration_check=`grep -c preop /var/lib/${tks_instance_name}/conf/CS.cfg`
< if [ ${tks_configuration_check} -eq 0 ] ; then
< printf "${configuration_error_preamble} '${tks_instance_name}' "
< printf "${configuration_error_postamble}\n"
< configuration_errors=`expr ${configuration_errors} + 1`
< fi
---
> tks_configuration_check=`grep -c preop /var/lib/${pki_tks_instance_name}/conf/CS.cfg`
> if [ ${tks_configuration_check} -eq 0 ] ; then
> printf "${configuration_error_preamble} '${pki_tks_instance_name}' "
> printf "${configuration_error_postamble}\n"
> configuration_errors=`expr ${configuration_errors} + 1`
> fi
413,419c424,430
< if [ ${usage_errors} -ne 0 ] ||
< [ ${existence_errors} -ne 0 ] ||
< [ ${configuration_errors} -ne 0 ] ; then
< printf "\n"
< printf "Please correct ALL errors listed above and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> if [ ${usage_errors} -ne 0 ] ||
> [ ${existence_errors} -ne 0 ] ||
> [ ${configuration_errors} -ne 0 ] ; then
> printf "\n"
> printf "Please correct ALL errors listed above and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
425,428c436,439
< printf "\n"
< printf "ERROR: Please install the 'pki-silent' package and re-run\n"
< printf "the '$0' script!\n\n"
< exit 255
---
> printf "\n"
> printf "ERROR: Please install the 'pki-silent' package and re-run\n"
> printf "the '$0' script!\n\n"
> exit 255
433,445c444,453
< ## Instead, inform the user and exit this script.
< if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
< [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
< [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
< printf "\n"
< printf "WARNING: At least one of the security databases\n"
< printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
< printf " required by '${pki_silent_script}' exists at the\n"
< printf " specified location '${pki_silent_security_database_repository}'.\n"
< printf "\n"
< printf " Please MANUALLY move or erase these security database(s),\n"
< printf " or specify a different location before re-running this script.\n\n"
< exit 255
---
> ## Instead, just inform the user.
> if [ -f "${pki_silent_security_database_repository}/cert8.db" ] ||
> [ -f "${pki_silent_security_database_repository}/key3.db" ] ||
> [ -f "${pki_silent_security_database_repository}/secmod.db" ] ; then
> printf "\n"
> printf "WARNING: The existing security databases\n"
> printf " (i. e. - 'cert8.db', 'key3.db', and/or 'secmod.db')\n"
> printf " required by '${pki_silent_script}' at the\n"
> printf " specified location '${pki_silent_security_database_repository}'\n"
> printf " will be used.\n\n"
449c457
< ## (5) Remove ALL old PKI Silent log files
---
> ## (5) Remove any old PKI Silent log file named '${pki_silent_tks_log}'
452,454c460,462
< printf " Removing old '${pki_silent_tks_log}' . . . "
< rm ${pki_silent_tks_log}
< printf "done.\n"
---
> printf " Removing old '${pki_silent_tks_log}' . . . "
> rm ${pki_silent_tks_log}
> printf "done.\n"
465,466c473,474
< tks_preop_pin=`cat /var/lib/${tks_instance_name}/conf/CS.cfg \
< | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
---
> tks_preop_pin=`cat /var/lib/${pki_tks_instance_name}/conf/CS.cfg \
> | grep preop.pin | grep -v grep | awk -F= '{print $2}'`
475c483
< ## execute '/sbin/service ${tks_instance_name} status':
---
> ## execute '/sbin/service ${pki_tks_instance_name} status':
477c485
< ## ${tks_instance_name} (pid 14129) is running ...
---
> ## ${pki_tks_instance_name} (pid 14129) is running ...
494c502
< printf "'${pki_silent_script}': Configuring '${tks_instance_name}' . . .\n"
---
> printf "'${pki_silent_script}': Configuring '${pki_tks_instance_name}' . . .\n"
496,537c504,545
< -cs_hostname "${pki_tks_admin_host}" \
< -cs_port ${tks_admin_port} \
< -sd_hostname "${pki_security_domain_host}" \
< -sd_ssl_port ${ca_ee_port} \
< -sd_agent_port ${ca_agent_port} \
< -sd_admin_port ${ca_admin_port} \
< -sd_admin_name "${pki_security_domain_admin_name}" \
< -sd_admin_password ${pki_security_domain_admin_password} \
< -ca_hostname ${pki_ca_ee_host} \
< -ca_port ${ca_nonssl_port} \
< -ca_ssl_port ${ca_ee_port} \
< -client_certdb_dir ${pki_silent_security_database_repository} \
< -client_certdb_pwd ${pki_silent_security_database_password} \
< -client_token_name ${pki_silent_security_token_name} \
< -preop_pin ${tks_preop_pin} \
< -domain_name "${pki_security_domain_name}" \
< -admin_user ${pki_silent_admin_user} \
< -admin_password ${pki_silent_admin_password} \
< -admin_email "${pki_silent_admin_email}" \
< -agent_name ${tks_agent_name} \
< -ldap_host ${pki_ldap_host} \
< -ldap_port ${pki_ldap_port} \
< -bind_dn "${pki_bind_dn}" \
< -bind_password ${pki_bind_password} \
< -base_dn "${tks_base_dn}" \
< -db_name "${tks_db_name}" \
< -remove_data "${pki_remove_data}" \
< -key_size ${tks_key_size} \
< -key_type ${tks_key_type} \
< -token_name ${tks_token_name} \
< -token_pwd ${tks_token_password} \
< -agent_key_size ${tks_agent_key_size} \
< -agent_key_type ${tks_agent_key_type} \
< -agent_cert_subject "${tks_agent_cert_subject}" \
< -subsystem_name ${tks_subsystem_name} \
< -save_p12 ${tks_save_p12} \
< -backup_pwd ${tks_backup_password} \
< -tks_subsystem_cert_subject_name "${tks_subsystem_cert_subject_name}" \
< -tks_server_cert_subject_name "${tks_server_cert_subject_name}" \
< -tks_audit_signing_cert_subject_name \
< "${tks_audit_signing_cert_subject_name}" \
< | tee ${pki_silent_tks_log}
---
> -cs_hostname "${pki_tks_admin_host}" \
> -cs_port ${pki_tks_admin_port} \
> -sd_hostname "${pki_security_domain_host}" \
> -sd_ssl_port ${pki_ca_ee_port} \
> -sd_agent_port ${pki_ca_agent_port} \
> -sd_admin_port ${pki_ca_admin_port} \
> -sd_admin_name "${pki_security_domain_admin_name}" \
> -sd_admin_password ${pki_security_domain_admin_password} \
> -ca_hostname ${pki_ca_ee_host} \
> -ca_port ${pki_ca_nonssl_port} \
> -ca_ssl_port ${pki_ca_ee_port} \
> -client_certdb_dir ${pki_silent_security_database_repository} \
> -client_certdb_pwd ${pki_silent_security_token_password} \
> -client_token_name ${pki_silent_security_token_name} \
> -preop_pin ${tks_preop_pin} \
> -domain_name "${pki_security_domain_name}" \
> -admin_user ${pki_silent_admin_user} \
> -admin_password ${pki_silent_admin_password} \
> -admin_email "${pki_silent_admin_email}" \
> -agent_name ${tks_agent_name} \
> -ldap_host ${pki_ldap_host} \
> -ldap_port ${pki_ldap_port} \
> -bind_dn "${pki_bind_dn}" \
> -bind_password ${pki_bind_password} \
> -base_dn "${tks_base_dn}" \
> -db_name "${tks_db_name}" \
> -remove_data "${pki_remove_data}" \
> -key_size ${tks_key_size} \
> -key_type ${tks_key_type} \
> -token_name ${pki_tks_token_name} \
> -token_pwd ${pki_tks_token_password} \
> -agent_key_size ${tks_agent_key_size} \
> -agent_key_type ${tks_agent_key_type} \
> -agent_cert_subject "${tks_agent_cert_subject}" \
> -subsystem_name ${pki_tks_subsystem_name} \
> -save_p12 ${tks_save_p12} \
> -backup_pwd ${pki_tks_backup_password} \
> -tks_subsystem_cert_subject_name "${tks_subsystem_cert_subject_name}" \
> -tks_server_cert_subject_name "${tks_server_cert_subject_name}" \
> -tks_audit_signing_cert_subject_name \
> "${tks_audit_signing_cert_subject_name}" \
> | tee ${pki_silent_tks_log}
540c548
< /sbin/service ${tks_instance_name} restart
---
> /sbin/service ${pki_tks_instance_name} restart
Only in 20130413/pki/base/silent/templates: silent_tps_to_ip_port.template
diff -r 20130410/pki/base/silent/templates/subca_silent.template 20130413/pki/base/silent/templates/subca_silent.template
86c86
< pki_silent_security_database_password=
---
> pki_silent_security_token_password=
317,318c317,318
< if [ "${pki_silent_security_database_password}" = "" ] ; then
< printf "${usage_error_preamble} 'pki_silent_security_database_password'!\n"
---
> if [ "${pki_silent_security_token_password}" = "" ] ; then
> printf "${usage_error_preamble} 'pki_silent_security_token_password'!\n"
475c475
< -client_certdb_pwd ${pki_silent_security_database_password} \
---
> -client_certdb_pwd ${pki_silent_security_token_password} \
diff -r 20130410/pki/base/symkey/.svn/entries 20130413/pki/base/symkey/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/config/.svn/entries 20130413/pki/base/symkey/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/m4/.svn/entries 20130413/pki/base/symkey/m4/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/src/.svn/entries 20130413/pki/base/symkey/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/src/com/.svn/entries 20130413/pki/base/symkey/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/src/com/netscape/.svn/entries 20130413/pki/base/symkey/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/symkey/src/com/netscape/symkey/.svn/entries 20130413/pki/base/symkey/src/com/netscape/symkey/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/.svn/entries 20130413/pki/base/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/config/.svn/entries 20130413/pki/base/tks/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/doc/.svn/entries 20130413/pki/base/tks/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/setup/.svn/entries 20130413/pki/base/tks/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/.svn/entries 20130413/pki/base/tks/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/alias/.svn/entries 20130413/pki/base/tks/shared/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/conf/.svn/entries 20130413/pki/base/tks/shared/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/etc/.svn/entries 20130413/pki/base/tks/shared/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/etc/init.d/.svn/entries 20130413/pki/base/tks/shared/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/logs/.svn/entries 20130413/pki/base/tks/shared/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/logs/signedAudit/.svn/entries 20130413/pki/base/tks/shared/logs/signedAudit/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/shared/.svn/entries 20130413/pki/base/tks/shared/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/shared/classes/.svn/entries 20130413/pki/base/tks/shared/shared/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/shared/lib/.svn/entries 20130413/pki/base/tks/shared/shared/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/temp/.svn/entries 20130413/pki/base/tks/shared/temp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/.svn/entries 20130413/pki/base/tks/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/ROOT/.svn/entries 20130413/pki/base/tks/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/ROOT/WEB-INF/.svn/entries 20130413/pki/base/tks/shared/webapps/ROOT/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/tks/.svn/entries 20130413/pki/base/tks/shared/webapps/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/tks/WEB-INF/.svn/entries 20130413/pki/base/tks/shared/webapps/tks/WEB-INF/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/webapps/tks/WEB-INF/classes/.svn/entries 20130413/pki/base/tks/shared/webapps/tks/WEB-INF/classes/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/shared/work/.svn/entries 20130413/pki/base/tks/shared/work/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/src/.svn/entries 20130413/pki/base/tks/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/src/com/.svn/entries 20130413/pki/base/tks/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/src/com/netscape/.svn/entries 20130413/pki/base/tks/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tks/src/com/netscape/tks/.svn/entries 20130413/pki/base/tks/src/com/netscape/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/.svn/entries 20130413/pki/base/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/alias/.svn/entries 20130413/pki/base/tps/alias/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/apache/.svn/entries 20130413/pki/base/tps/apache/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/apache/conf/.svn/entries 20130413/pki/base/tps/apache/conf/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/applets/.svn/entries 20130413/pki/base/tps/applets/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/config/.svn/entries 20130413/pki/base/tps/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/doc/.svn/entries 20130413/pki/base/tps/doc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/etc/.svn/entries 20130413/pki/base/tps/etc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/etc/init.d/.svn/entries 20130413/pki/base/tps/etc/init.d/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/.svn/entries 20130413/pki/base/tps/forms/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/.svn/entries 20130413/pki/base/tps/forms/esc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/cgi-bin/.svn/entries 20130413/pki/base/tps/forms/esc/cgi-bin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/cgi-bin/demo/.svn/entries 20130413/pki/base/tps/forms/esc/cgi-bin/demo/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/cgi-bin/home/.svn/entries 20130413/pki/base/tps/forms/esc/cgi-bin/home/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/cgi-bin/so/.svn/entries 20130413/pki/base/tps/forms/esc/cgi-bin/so/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/cgi-bin/sow/.svn/entries 20130413/pki/base/tps/forms/esc/cgi-bin/sow/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/demo/.svn/entries 20130413/pki/base/tps/forms/esc/demo/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/home/.svn/entries 20130413/pki/base/tps/forms/esc/home/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/images/.svn/entries 20130413/pki/base/tps/forms/esc/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/so/.svn/entries 20130413/pki/base/tps/forms/esc/so/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/sow/.svn/entries 20130413/pki/base/tps/forms/esc/sow/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/sow/css/.svn/entries 20130413/pki/base/tps/forms/esc/sow/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/sow/images/.svn/entries 20130413/pki/base/tps/forms/esc/sow/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/esc/sow/js/.svn/entries 20130413/pki/base/tps/forms/esc/sow/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/.svn/entries 20130413/pki/base/tps/forms/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/.svn/entries 20130413/pki/base/tps/forms/tps/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/console/.svn/entries 20130413/pki/base/tps/forms/tps/admin/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/console/config/.svn/entries 20130413/pki/base/tps/forms/tps/admin/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/console/css/.svn/entries 20130413/pki/base/tps/forms/tps/admin/console/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/console/img/.svn/entries 20130413/pki/base/tps/forms/tps/admin/console/img/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tps/admin/console/js/.svn/entries 20130413/pki/base/tps/forms/tps/admin/console/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/forms/tus/.svn/entries 20130413/pki/base/tps/forms/tus/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/.svn/entries 20130413/pki/base/tps/lib/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/.svn/entries 20130413/pki/base/tps/lib/perl/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/PKI/.svn/entries 20130413/pki/base/tps/lib/perl/PKI/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/PKI/Base/.svn/entries 20130413/pki/base/tps/lib/perl/PKI/Base/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/PKI/Service/.svn/entries 20130413/pki/base/tps/lib/perl/PKI/Service/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/.svn/entries 20130413/pki/base/tps/lib/perl/PKI/TPS/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm 20130413/pki/base/tps/lib/perl/PKI/TPS/CAInfoPanel.pm
81c81
< $::symbol{errorString} = "No CA information provided. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> $::symbol{errorString} = "No CA information provided. CA, TKS, and optionally DRM must be installed prior to TPS installation";
85a86,87
> &PKI::TPS::Wizard::debug_log("CAInfoPanel: update - selected ca= $count");
>
87c89,91
< my $host = "";
---
> my $ca_ee_host = "";
> my $ca_agent_host = "";
> my $ca_admin_host = "";
94a99,103
> &PKI::TPS::Wizard::debug_log("CAInfoPanel: update - It is believed "
> . "that 'pkisilent' no longer utilizes "
> . "this code path, so this message "
> . "should not appear in the log!");
>
96,98c105,107
< $host = defined($info->host) ? $info->host : "";
< if ($host eq "") {
< $::symbol{errorString} = "No CA host provided.";
---
> $ca_ee_host = defined($info->host) ? $info->host : "";
> if ($ca_ee_host eq "") {
> $::symbol{errorString} = "No CA EE host provided.";
108c117
< $domain_xml = get_domain_xml($host, $https_ee_port);
---
> $domain_xml = get_domain_xml($ca_ee_host, $https_ee_port);
110c119
< $::symbol{errorString} = "missing security domain. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> $::symbol{errorString} = "missing security domain. CA, TKS, and optionally DRM must be installed prior to TPS installation";
114,118c123,130
< $https_agent_port = get_secure_agent_port_from_domain_xml($domain_xml, $host, $https_ee_port);
< $https_admin_port = get_secure_admin_port_from_domain_xml($domain_xml, $host, $https_ee_port);
<
< if(($https_admin_port eq "") || ($https_agent_port eq "")) {
< $::symbol{errorString} = "secure CA admin or agent port information not provided by security domain.";
---
> $ca_agent_host = get_agent_host_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $https_agent_port = get_secure_agent_port_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $ca_admin_host = get_admin_host_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
> $https_admin_port = get_secure_admin_port_from_domain_xml($domain_xml, $ca_ee_host, $https_ee_port);
>
> if(($ca_admin_host eq "") || ($https_admin_port eq "") ||
> ($ca_agent_host eq "") || ($https_agent_port eq "")) {
> $::symbol{errorString} = "missing secure CA admin or agent host/port information not provided by security domain. CA, TKS, and optionally DRM must be installed prior to TPS installation.";
122,123c134,138
< $host = defined($::config->get("preop.securitydomain.ca$count.host")) ?
< $::config->get("preop.securitydomain.ca$count.host") : "";
---
> &PKI::TPS::Wizard::debug_log("CAInfoPanel: update - "
> . "Obtaining CA Info from 'CS.cfg'.");
>
> $ca_ee_host = defined($::config->get("preop.securitydomain.ca$count.eehost")) ?
> $::config->get("preop.securitydomain.ca$count.eehost") : "";
125a141,142
> $ca_agent_host = defined($::config->get("preop.securitydomain.ca$count.agenthost")) ?
> $::config->get("preop.securitydomain.ca$count.agenthost") : "";
127a145,146
> $ca_admin_host = defined($::config->get("preop.securitydomain.ca$count.adminhost")) ?
> $::config->get("preop.securitydomain.ca$count.adminhost") : "";
132,133c151,154
< if (($host eq "") || ($https_ee_port eq "") || ($https_admin_port eq "") || ($https_agent_port eq "")) {
< $::symbol{errorString} = "no CA found. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> if (($ca_ee_host eq "") || ($https_ee_port eq "") ||
> ($ca_agent_host eq "") || ($https_agent_port eq "") ||
> ($ca_admin_host eq "") || ($https_admin_port eq "")) {
> $::symbol{errorString} = "no CA found. CA, TKS, and optionally DRM must be installed prior to TPS installation";
137c158
< &PKI::TPS::Wizard::debug_log("CAInfoPanel: update - host= $host, https_ee_port= $https_ee_port");
---
> &PKI::TPS::Wizard::debug_log("CAInfoPanel: update - ca_ee_host= $ca_ee_host, https_ee_port= $https_ee_port");
139c160
< $::config->put("preop.cainfo.select", "https://$host:$https_admin_port");
---
> $::config->put("preop.cainfo.select", "https://$ca_admin_host:$https_admin_port");
144,146c165,167
< $::config->put("conn.ca1.hostport", $host . ":" . $https_ee_port);
< $::config->put("conn.ca1.hostagentport", $host . ":" . $https_agent_port);
< $::config->put("conn.ca1.hostadminport", $host . ":" . $https_admin_port);
---
> $::config->put("conn.ca1.hostport", $ca_ee_host . ":" . $https_ee_port);
> $::config->put("conn.ca1.hostagentport", $ca_agent_host . ":" . $https_agent_port);
> $::config->put("conn.ca1.hostadminport", $ca_admin_host . ":" . $https_admin_port);
156c177
< system("/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$serverCertNickName\" -r \"/ca/ee/ca/getCertChain\" $host:$https_ee_port > $tmpfile");
---
> system("/usr/bin/sslget -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$serverCertNickName\" -r \"/ca/ee/ca/getCertChain\" $ca_ee_host:$https_ee_port > $tmpfile");
204,206c225,227
< my $host = "";
< $host = $::config->get("preop.securitydomain.ca$count.host");
< if ($host eq "") {
---
> my $ca_ee_host = "";
> $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost");
> if ($ca_ee_host eq "") {
211,212c232,233
< my $item = $name . " - https://" . $host . ":" . $https_ee_port;
< # my $item = "https://" . $host . ":" . $https_ee_port;
---
> my $item = $name . " - https://" . $ca_ee_host . ":" . $https_ee_port;
> # my $item = "https://" . $ca_ee_host . ":" . $https_ee_port;
236c257
< my $host = $1;
---
> my $ca_ee_host = $1;
260c281
< my $host = $2;
---
> my $ca_ee_host = $2;
264c285
< # to the selected host and secure ee port.
---
> # to the selected EE host and secure ee port.
272c293
< if( ( $host eq $c->{'Host'}[0] ) &&
---
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
286c307
< my $host = $2;
---
> my $ca_ee_host = $2;
290c311
< # to the selected host and secure ee port.
---
> # to the selected EE host and secure ee port.
298c319
< if( ( $host eq $c->{'Host'}[0] ) &&
---
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
308a330,393
> sub get_admin_host_from_domain_xml
> {
> my $content = $1;
> my $ca_ee_host = $2;
> my $https_ee_port = $3;
>
> # Retrieve the admin host corresponding
> # to the selected EE host and secure ee port.
> my $parser = XML::Simple->new();
> my $response = $parser->XMLin($content);
> my $xml = $parser->XMLin( $response->{'DomainInfo'},
> ForceArray => 1 );
> my $ca_admin_host = "";
> my $count = 0;
> foreach my $c (@{$xml->{'CAList'}[0]->{'CA'}}) {
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
> ( $https_ee_port eq $c->{'SecurePort'}[0] ) ) {
> if( $c->{'AdminHost'}[0] ne "" ) {
> # IP Port Separation Schema
> $ca_admin_host = https_$c->{'AdminHost'}[0];
> } else {
> # Port Separation Schema
> $ca_admin_host = https_$c->{'Host'}[0];
> }
> }
>
> $count++;
> }
>
> return $ca_admin_host;
> }
>
> sub get_agent_host_from_domain_xml
> {
> my $content = $1;
> my $ca_ee_host = $2;
> my $https_ee_port = $3;
>
> # Retrieve the agent host corresponding
> # to the selected EE host and secure ee port.
> my $parser = XML::Simple->new();
> my $response = $parser->XMLin($content);
> my $xml = $parser->XMLin( $response->{'DomainInfo'},
> ForceArray => 1 );
> my $ca_agent_host = "";
> my $count = 0;
> foreach my $c (@{$xml->{'CAList'}[0]->{'CA'}}) {
> if( ( $ca_ee_host eq $c->{'Host'}[0] ) &&
> ( $https_ee_port eq $c->{'SecurePort'}[0] ) ) {
> if( $c->{'AgentHost'}[0] ne "" ) {
> # IP Port Separation Schema
> $ca_agent_host = https_$c->{'AgentHost'}[0];
> } else {
> # Port Separation Schema
> $ca_agent_host = https_$c->{'Host'}[0];
> }
> }
>
> $count++;
> }
>
> return $ca_agent_host;
> }
>
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm 20130413/pki/base/tps/lib/perl/PKI/TPS/DRMInfoPanel.pm
88c88,89
< my $host = "";
---
> my $kra_agent_host = "";
> my $kra_admin_host = "";
93a95,99
> &PKI::TPS::Wizard::debug_log("DRMInfoPanel: update - It is believed "
> . "that 'pkisilent' no longer utilizes "
> . "this code path, so this message "
> . "should not appear in the log!");
>
95c101
< $host = defined($info->host) ? $info->host : "";
---
> $kra_agent_host = defined($info->host) ? $info->host : "";
96a103
> $kra_admin_host = defined($q->param('adminhost'))? $q->param('adminhost') : "";
99,100c106,110
< $host = defined($::config->get("preop.securitydomain.kra$count.host")) ?
< $::config->get("preop.securitydomain.kra$count.host") : "";
---
> &PKI::TPS::Wizard::debug_log("DRMInfoPanel: update - "
> . "Obtaining DRM Info from 'CS.cfg'.");
>
> $kra_agent_host = defined($::config->get("preop.securitydomain.kra$count.agenthost")) ?
> $::config->get("preop.securitydomain.kra$count.agenthost") : "";
102a113,114
> $kra_admin_host = defined($::config->get("preop.securitydomain.kra$count.adminhost")) ?
> $::config->get("preop.securitydomain.kra$count.adminhost") : "";
108c120
< if (($host eq "") || ($https_agent_port eq "")) {
---
> if (($kra_agent_host eq "") || ($https_agent_port eq "")) {
123c135
< $::config->put("preop.krainfo.select", "https://$host:$https_admin_port");
---
> $::config->put("preop.krainfo.select", "https://$kra_admin_host:$https_admin_port");
125c137
< $::config->put("conn.drm1.hostport", $host . ":" . $https_agent_port);
---
> $::config->put("conn.drm1.hostport", $kra_agent_host . ":" . $https_agent_port);
159,161c171,173
< my $host = "";
< $host = $::config->get("preop.securitydomain.kra$count.host");
< if ($host eq "") {
---
> my $kra_agent_host = "";
> $kra_agent_host = $::config->get("preop.securitydomain.kra$count.agenthost");
> if ($kra_agent_host eq "") {
166c178
< $::symbol{urls}[$count++] = $name . " - https://" . $host . ":" . $https_agent_port;
---
> $::symbol{urls}[$count++] = $name . " - https://" . $kra_agent_host . ":" . $https_agent_port;
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm 20130413/pki/base/tps/lib/perl/PKI/TPS/DisplayCertChainPanel.pm
254,256c254,260
< $c->{'EEClientAuthPort'}[0]);
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> $c->{'SecureEEClientAuthPort'}[0]);
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
> my $ca_agent_hostname = "";
> my $ca_ee_hostname = "";
> my $ca_admin_hostname = "";
> my $ca_eeca_hostname = "";
259a264
> $ca_agent_hostname = $c->{'AgentHost'}[0];
262a268
> $ca_agent_hostname = $c->{'Host'}[0];
266a273
> $ca_ee_hostname = $c->{'EEHost'}[0];
269a277
> $ca_ee_hostname = $c->{'Host'}[0];
273a282
> $ca_admin_hostname = $c->{'AdminHost'}[0];
276a286
> $ca_admin_hostname = $c->{'Host'}[0];
280a291
> $ca_eeca_hostname = $c->{'EEClientAuthHost'}[0];
283a295
> $ca_eeca_hostname = $c->{'Host'}[0];
290,291c302
< if( ( $sd_host eq $c-> $::config->put("preop.securitydomain.ca" .
< $count . ".adminhost") ) &&
---
> if( ( $sd_host eq $ca_admin_hostname ) &&
294,311c305,310
< my $http_ee_port = "http://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eehost")
< . ":"
< . $c->{'UnSecurePort'}[0];
< my $https_agent_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".agenthost")
< . ":"
< . $c->{'SecureAgentPort'}[0];
< my $https_ee_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eehost")
< . ":"
< . $c->{'SecurePort'}[0];
< my $https_eeca_port = "https://"
< . $::config->get("preop.securitydomain.ca" .
< $count . ".eecahost")
---
> my $http_ee_url = "http://"
> . $ca_ee_hostname
> . ":"
> . $c->{'UnSecurePort'}[0];
> my $https_agent_url = "https://"
> . $ca_agent_hostname
313c312,320
< . $c->{'EEClientAuthPort'}[0];
---
> . $c->{'SecureAgentPort'}[0];
> my $https_ee_url = "https://"
> . $ca_ee_hostname
> . ":"
> . $c->{'SecurePort'}[0];
> my $https_eeca_url = "https://"
> . $ca_eeca_hostname
> . ":"
> . $c->{'SecureEEClientAuthPort'}[0];
316,319c323,326
< $::config->put( "config.sdomainHttpURL", $http_ee_port );
< $::config->put( "config.sdomainAgentURL", $https_agent_port );
< $::config->put( "config.sdomainEEURL", $https_ee_port );
< $::config->put( "config.sdomainEECAURL", $https_eeca_port );
---
> $::config->put( "config.sdomainHttpURL", $http_ee_url );
> $::config->put( "config.sdomainAgentURL", $https_agent_url );
> $::config->put( "config.sdomainEEURL", $https_ee_url );
> $::config->put( "config.sdomainEECAURL", $https_eeca_url );
328c335
< $::config->put( "securitydomain.eehost",
---
> $::config->put( "securitydomain.eecahost",
336a344,345
> $::config->put( "securitydomain.httpseecaport",
> $c->{'SecureEEClientAuthPort'}[0] );
356,357c365,366
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
396,397c405,406
< // Account for a Security Domain using either an IP Port Separation
< // Schema, or a Port Separation Schema
---
> # Account for a Security Domain using either an IP Port Separation
> # Schema, or a Port Separation Schema
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm 20130413/pki/base/tps/lib/perl/PKI/TPS/NamePanel.pm
88c88
< my $host = "";
---
> my $ca_ee_host = "";
94c94
< $host = $info->host;
---
> $ca_ee_host = $info->host;
97,98c97,98
< $host = $::config->get("preop.securitydomain.ca$count.host");
< if ($host eq "") {
---
> $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost");
> if ($ca_ee_host eq "") {
102c102
< &PKI::TPS::Wizard::debug_log("NamePanel: update - host= $host, https_ee_port= $https_ee_port");
---
> &PKI::TPS::Wizard::debug_log("NamePanel: update - ca_ee_host= $ca_ee_host, https_ee_port= $https_ee_port");
107c107
< $::config->put("preop.ca.url", "https://" . $host . ":" . $https_ee_port);
---
> $::config->put("preop.ca.url", "https://" . $ca_ee_host . ":" . $https_ee_port);
303c303
< $host = $sdom_url->host;
---
> $ca_ee_host = $sdom_url->host;
308,309c308,309
< $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$token_pwd\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
< $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
---
> $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$token_pwd\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
> $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
312,313c312,313
< $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
< $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $host:$https_ee_port";
---
> $req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"$db_password\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
> $debug_req = "/usr/bin/sslget -e \"$params\" -d \"$instanceDir/alias\" -p \"(sensitive)\" -v -n \"$sslnickname\" -r \"/ca/ee/ca/profileSubmit\" $ca_ee_host:$https_ee_port";
519,520c519,520
< my $host = $::config->get("preop.securitydomain.ca$count.host") || "";
< if ($host eq "") {
---
> my $ca_ee_host = $::config->get("preop.securitydomain.ca$count.eehost") || "";
> if ($ca_ee_host eq "") {
525c525
< my $item = $name . " - https://" . $host . ":" . $https_ee_port;
---
> my $item = $name . " - https://" . $ca_ee_host . ":" . $https_ee_port;
diff -r 20130410/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm 20130413/pki/base/tps/lib/perl/PKI/TPS/TKSInfoPanel.pm
78c78
< $::symbol{errorString} = "no TKS info provided. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> $::symbol{errorString} = "no TKS info provided. CA, TKS, and optionally DRM must be installed prior to TPS installation";
84c84,85
< my $host = "";
---
> my $tks_agent_host = "";
> my $tks_admin_host = "";
89a91,95
> &PKI::TPS::Wizard::debug_log("TKSInfoPanel: update - It is believed "
> . "that 'pkisilent' no longer utilizes "
> . "this code path, so this message "
> . "should not appear in the log!");
>
91c97
< $host = defined($info->host) ? $info->host : "";
---
> $tks_agent_host = defined($info->host) ? $info->host : "";
92a99
> $tks_admin_host = defined($q->param('adminhost')) ? $q->param('adminhost') : "";
95,96c102,106
< $host = defined($::config->get("preop.securitydomain.tks$count.host")) ?
< $::config->get("preop.securitydomain.tks$count.host") : "";
---
> &PKI::TPS::Wizard::debug_log("TKSInfoPanel: update - "
> . "Obtaining TKS Info from 'CS.cfg'.");
>
> $tks_admin_host = defined($::config->get("preop.securitydomain.tks$count.adminhost")) ?
> $::config->get("preop.securitydomain.tks$count.adminhost") : "";
98a109,110
> $tks_agent_host = defined($::config->get("preop.securitydomain.tks$count.agenthost")) ?
> $::config->get("preop.securitydomain.tks$count.agenthost") : "";
103,104c115,116
< if (($host eq "") || ($https_agent_port eq "")) {
< $::symbol{errorString} = "no TKS found. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> if (($tks_agent_host eq "") || ($https_agent_port eq "")) {
> $::symbol{errorString} = "no TKS found. CA, TKS, and optionally DRM must be installed prior to TPS installation";
108c120
< if ($https_admin_port eq "") {
---
> if (($tks_admin_host eq "") || ($https_admin_port eq "")) {
118c130
< $::config->put("preop.tksinfo.select", "https://$host:$https_admin_port");
---
> $::config->put("preop.tksinfo.select", "https://$tks_admin_host:$https_admin_port");
120c132
< $::config->put("conn.tks1.hostport", $host . ":" . $https_agent_port);
---
> $::config->put("conn.tks1.hostport", $tks_agent_host . ":" . $https_agent_port);
134,136c146,148
< my $host = "";
< $host = $::config->get("preop.securitydomain.tks$count.host");
< if ($host eq "") {
---
> my $tks_agent_host = "";
> $tks_agent_host = $::config->get("preop.securitydomain.tks$count.agenthost");
> if ($tks_agent_host eq "") {
141c153
< $::symbol{urls}[$count++] = $name . " - https://" . $host . ":" . $https_agent_port;
---
> $::symbol{urls}[$count++] = $name . " - https://" . $tks_agent_host . ":" . $https_agent_port;
146c158
< $::symbol{errorString} = "no TKS found. CA, TKS and optionally DRM must be installed prior to TPS installation";
---
> $::symbol{errorString} = "no TKS found. CA, TKS, and optionally DRM must be installed prior to TPS installation";
diff -r 20130410/pki/base/tps/lib/perl/Template/.svn/entries 20130413/pki/base/tps/lib/perl/Template/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/logs/.svn/entries 20130413/pki/base/tps/logs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/logs/signedAudit/.svn/entries 20130413/pki/base/tps/logs/signedAudit/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/m4/.svn/entries 20130413/pki/base/tps/m4/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/scripts/.svn/entries 20130413/pki/base/tps/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/setup/.svn/entries 20130413/pki/base/tps/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/.svn/entries 20130413/pki/base/tps/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/apdu/.svn/entries 20130413/pki/base/tps/src/apdu/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/authentication/.svn/entries 20130413/pki/base/tps/src/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/channel/.svn/entries 20130413/pki/base/tps/src/channel/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/cms/.svn/entries 20130413/pki/base/tps/src/cms/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/engine/.svn/entries 20130413/pki/base/tps/src/engine/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/httpClient/.svn/entries 20130413/pki/base/tps/src/httpClient/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/.svn/entries 20130413/pki/base/tps/src/include/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/apdu/.svn/entries 20130413/pki/base/tps/src/include/apdu/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/authentication/.svn/entries 20130413/pki/base/tps/src/include/authentication/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/channel/.svn/entries 20130413/pki/base/tps/src/include/channel/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/cms/.svn/entries 20130413/pki/base/tps/src/include/cms/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/engine/.svn/entries 20130413/pki/base/tps/src/include/engine/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/httpClient/.svn/entries 20130413/pki/base/tps/src/include/httpClient/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/httpClient/httpc/.svn/entries 20130413/pki/base/tps/src/include/httpClient/httpc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/main/.svn/entries 20130413/pki/base/tps/src/include/main/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/modules/.svn/entries 20130413/pki/base/tps/src/include/modules/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/modules/tps/.svn/entries 20130413/pki/base/tps/src/include/modules/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/msg/.svn/entries 20130413/pki/base/tps/src/include/msg/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/processor/.svn/entries 20130413/pki/base/tps/src/include/processor/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/publisher/.svn/entries 20130413/pki/base/tps/src/include/publisher/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/selftests/.svn/entries 20130413/pki/base/tps/src/include/selftests/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/service/.svn/entries 20130413/pki/base/tps/src/include/service/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/include/tus/.svn/entries 20130413/pki/base/tps/src/include/tus/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/main/.svn/entries 20130413/pki/base/tps/src/main/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/modules/.svn/entries 20130413/pki/base/tps/src/modules/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/modules/tokendb/.svn/entries 20130413/pki/base/tps/src/modules/tokendb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/modules/tps/.svn/entries 20130413/pki/base/tps/src/modules/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/msg/.svn/entries 20130413/pki/base/tps/src/msg/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/processor/.svn/entries 20130413/pki/base/tps/src/processor/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/selftests/.svn/entries 20130413/pki/base/tps/src/selftests/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/test/.svn/entries 20130413/pki/base/tps/src/test/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/src/tus/.svn/entries 20130413/pki/base/tps/src/tus/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/stubs/.svn/entries 20130413/pki/base/tps/stubs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/stubs/modules/.svn/entries 20130413/pki/base/tps/stubs/modules/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/stubs/modules/nss/.svn/entries 20130413/pki/base/tps/stubs/modules/nss/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/tools/.svn/entries 20130413/pki/base/tps/tools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/tools/raclient/.svn/entries 20130413/pki/base/tps/tools/raclient/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/tools/tus/.svn/entries 20130413/pki/base/tps/tools/tus/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/ui/.svn/entries 20130413/pki/base/tps/ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/ui/perl/.svn/entries 20130413/pki/base/tps/ui/perl/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/tps/wrappers/.svn/entries 20130413/pki/base/tps/wrappers/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/.svn/entries 20130413/pki/base/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/config/.svn/entries 20130413/pki/base/util/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/.svn/entries 20130413/pki/base/util/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/.svn/entries 20130413/pki/base/util/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/.svn/entries 20130413/pki/base/util/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/crypto/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/crypto/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/http/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/http/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/ldap/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/ldap/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/net/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/net/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/ocsp/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/password/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/password/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/radius/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/radius/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/scep/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/scep/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/util/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/com/netscape/cmsutil/xml/.svn/entries 20130413/pki/base/util/src/com/netscape/cmsutil/xml/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/.svn/entries 20130413/pki/base/util/src/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/net/.svn/entries 20130413/pki/base/util/src/netscape/net/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/net/smtp/.svn/entries 20130413/pki/base/util/src/netscape/net/smtp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/.svn/entries 20130413/pki/base/util/src/netscape/security/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/acl/.svn/entries 20130413/pki/base/util/src/netscape/security/acl/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/extensions/.svn/entries 20130413/pki/base/util/src/netscape/security/extensions/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/pkcs/.svn/entries 20130413/pki/base/util/src/netscape/security/pkcs/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/provider/.svn/entries 20130413/pki/base/util/src/netscape/security/provider/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/util/.svn/entries 20130413/pki/base/util/src/netscape/security/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/base/util/src/netscape/security/x509/.svn/entries 20130413/pki/base/util/src/netscape/security/x509/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/.svn/entries 20130413/pki/dogtag/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca/.svn/entries 20130413/pki/dogtag/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca/config/.svn/entries 20130413/pki/dogtag/ca/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca/config-ext/.svn/entries 20130413/pki/dogtag/ca/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/.svn/entries 20130413/pki/dogtag/ca-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/config/.svn/entries 20130413/pki/dogtag/ca-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/config-ext/.svn/entries 20130413/pki/dogtag/ca-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/.svn/entries 20130413/pki/dogtag/ca-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/admin/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/admin/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/admin/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/agent/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/agent/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/ee/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/ee/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/.svn/entries 20130413/pki/dogtag/ca-ui/shared/webapps/ca/ee/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common/.svn/entries 20130413/pki/dogtag/common/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common/config/.svn/entries 20130413/pki/dogtag/common/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common/config-ext/.svn/entries 20130413/pki/dogtag/common/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/.svn/entries 20130413/pki/dogtag/common-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/config/.svn/entries 20130413/pki/dogtag/common-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/config-ext/.svn/entries 20130413/pki/dogtag/common-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/.svn/entries 20130413/pki/dogtag/common-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/console/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/console/config/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/console/config/.svn/entries
4c4
< 2556
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/console/css/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/console/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/console/img/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/console/img/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/common-ui/shared/admin/console/js/.svn/entries 20130413/pki/dogtag/common-ui/shared/admin/console/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/config-ext/.svn/entries 20130413/pki/dogtag/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console/.svn/entries 20130413/pki/dogtag/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console/config/.svn/entries 20130413/pki/dogtag/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console/config-ext/.svn/entries 20130413/pki/dogtag/console/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/.svn/entries 20130413/pki/dogtag/console-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/config/.svn/entries 20130413/pki/dogtag/console-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/config-ext/.svn/entries 20130413/pki/dogtag/console-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/.svn/entries 20130413/pki/dogtag/console-ui/src/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/.svn/entries 20130413/pki/dogtag/console-ui/src/com/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/admin/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/admin/certsrv/theme/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/management/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/management/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/management/client/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/management/client/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/management/client/theme/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/management/client/theme/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/.svn/entries 20130413/pki/dogtag/console-ui/src/com/netscape/management/client/theme/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/java-tools/.svn/entries 20130413/pki/dogtag/java-tools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/java-tools/config/.svn/entries 20130413/pki/dogtag/java-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/java-tools/config-ext/.svn/entries 20130413/pki/dogtag/java-tools/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra/.svn/entries 20130413/pki/dogtag/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra/config/.svn/entries 20130413/pki/dogtag/kra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra/config-ext/.svn/entries 20130413/pki/dogtag/kra/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/.svn/entries 20130413/pki/dogtag/kra-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/config/.svn/entries 20130413/pki/dogtag/kra-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/config-ext/.svn/entries 20130413/pki/dogtag/kra-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/.svn/entries 20130413/pki/dogtag/kra-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/kra/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/kra/agent/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/kra/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/kra/agent/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/.svn/entries 20130413/pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/manage/.svn/entries 20130413/pki/dogtag/manage/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/manage/config/.svn/entries 20130413/pki/dogtag/manage/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/manage/config-ext/.svn/entries 20130413/pki/dogtag/manage/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/migrate/.svn/entries 20130413/pki/dogtag/migrate/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/migrate/config/.svn/entries 20130413/pki/dogtag/migrate/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/migrate/config-ext/.svn/entries 20130413/pki/dogtag/migrate/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/native-tools/.svn/entries 20130413/pki/dogtag/native-tools/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/native-tools/config/.svn/entries 20130413/pki/dogtag/native-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/native-tools/config-ext/.svn/entries 20130413/pki/dogtag/native-tools/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp/.svn/entries 20130413/pki/dogtag/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp/config/.svn/entries 20130413/pki/dogtag/ocsp/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp/config-ext/.svn/entries 20130413/pki/dogtag/ocsp/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/.svn/entries 20130413/pki/dogtag/ocsp-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/config/.svn/entries 20130413/pki/dogtag/ocsp-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/config-ext/.svn/entries 20130413/pki/dogtag/ocsp-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/ocsp/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/.svn/entries 20130413/pki/dogtag/ocsp-ui/shared/webapps/ocsp/agent/ocsp/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/osutil/.svn/entries 20130413/pki/dogtag/osutil/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/osutil/config/.svn/entries 20130413/pki/dogtag/osutil/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/osutil/config-ext/.svn/entries 20130413/pki/dogtag/osutil/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra/.svn/entries 20130413/pki/dogtag/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra/config/.svn/entries 20130413/pki/dogtag/ra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra/config-ext/.svn/entries 20130413/pki/dogtag/ra/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/.svn/entries 20130413/pki/dogtag/ra-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/config/.svn/entries 20130413/pki/dogtag/ra-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/config-ext/.svn/entries 20130413/pki/dogtag/ra-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/.svn/entries 20130413/pki/dogtag/ra-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/admin/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/admin/group/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/admin/group/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/admin/user/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/admin/user/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/agent/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/agent/cert/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/agent/cert/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/agent/request/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/agent/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/css/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/agent/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/request/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/request/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/scep/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/scep/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/server/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/server/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ee/user/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ee/user/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/images/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/admin/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/img/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/.svn/entries 20130413/pki/dogtag/ra-ui/shared/docroot/ra/admin/console/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/scripts/.svn/entries 20130413/pki/dogtag/scripts/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/selinux/.svn/entries 20130413/pki/dogtag/selinux/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/selinux/config/.svn/entries 20130413/pki/dogtag/selinux/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/selinux/config-ext/.svn/entries 20130413/pki/dogtag/selinux/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/setup/.svn/entries 20130413/pki/dogtag/setup/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/setup/config/.svn/entries 20130413/pki/dogtag/setup/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/setup/config-ext/.svn/entries 20130413/pki/dogtag/setup/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/silent/.svn/entries 20130413/pki/dogtag/silent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/silent/config/.svn/entries 20130413/pki/dogtag/silent/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/silent/config-ext/.svn/entries 20130413/pki/dogtag/silent/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/symkey/.svn/entries 20130413/pki/dogtag/symkey/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/symkey/config/.svn/entries 20130413/pki/dogtag/symkey/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/symkey/config-ext/.svn/entries 20130413/pki/dogtag/symkey/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks/.svn/entries 20130413/pki/dogtag/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks/config/.svn/entries 20130413/pki/dogtag/tks/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks/config-ext/.svn/entries 20130413/pki/dogtag/tks/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/.svn/entries 20130413/pki/dogtag/tks-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/config/.svn/entries 20130413/pki/dogtag/tks-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/config-ext/.svn/entries 20130413/pki/dogtag/tks-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/.svn/entries 20130413/pki/dogtag/tks-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/ROOT/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/tks/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/tks/agent/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/tks/agent/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/tks/agent/graphics/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/.svn/entries 20130413/pki/dogtag/tks-ui/shared/webapps/tks/agent/tks/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps/.svn/entries 20130413/pki/dogtag/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps/config/.svn/entries 20130413/pki/dogtag/tps/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps/config-ext/.svn/entries 20130413/pki/dogtag/tps/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/.svn/entries 20130413/pki/dogtag/tps-ui/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/config/.svn/entries 20130413/pki/dogtag/tps-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/config-ext/.svn/entries 20130413/pki/dogtag/tps-ui/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/.svn/entries 20130413/pki/dogtag/tps-ui/shared/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/cgi-bin/.svn/entries 20130413/pki/dogtag/tps-ui/shared/cgi-bin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/cgi-bin/demo/.svn/entries 20130413/pki/dogtag/tps-ui/shared/cgi-bin/demo/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/cgi-bin/home/.svn/entries 20130413/pki/dogtag/tps-ui/shared/cgi-bin/home/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/cgi-bin/so/.svn/entries 20130413/pki/dogtag/tps-ui/shared/cgi-bin/so/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/cgi-bin/sow/.svn/entries 20130413/pki/dogtag/tps-ui/shared/cgi-bin/sow/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/css/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/demo/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/demo/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/home/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/home/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/images/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/so/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/so/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/so/images/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/so/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/sow/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/sow/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/sow/images/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/esc/sow/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tokendb/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tokendb/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/admin/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/admin/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/img/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/.svn/entries 20130413/pki/dogtag/tps-ui/shared/docroot/tps/admin/console/js/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/util/.svn/entries 20130413/pki/dogtag/util/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/util/config/.svn/entries 20130413/pki/dogtag/util/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/dogtag/util/config-ext/.svn/entries 20130413/pki/dogtag/util/config-ext/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/.svn/all-wcprops 20130413/pki/redhat/.svn/all-wcprops
4c4
< /repos/pki/!svn/ver/16072/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat
---
> /repos/pki/!svn/ver/16074/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat
diff -r 20130410/pki/redhat/.svn/entries 20130413/pki/redhat/.svn/entries
4c4
< 16073
---
> 16075
10,11c10,11
< 2013-04-04T19:24:00.009643Z
< 16072
---
> 2013-04-10T13:42:53.844212Z
> 16074
38c38
< tps-ui
---
> symkey
41c41
< symkey
---
> tps-ui
50,52d49
< selinux
< dir
<
56c53
< common
---
> selinux
59c56
< kra-ui
---
> migrate
65c62
< migrate
---
> kra-ui
68c65
< silent
---
> common
74c71
< setup
---
> silent
77c74
< tks
---
> setup
80c77
< ra
---
> tks
86c83
< common-ui
---
> ra
91a89,91
> common-ui
> dir
>
101c101
< util
---
> kra
104c104
< ra-ui
---
> console-ui
107c107
< console-ui
---
> ra-ui
110c110
< kra
---
> util
diff -r 20130410/pki/redhat/ca/.svn/entries 20130413/pki/redhat/ca/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca/config/.svn/entries 20130413/pki/redhat/ca/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ca/config-ext/.svn/entries 20130413/pki/redhat/ca/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/.svn/entries 20130413/pki/redhat/ca-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/config/.svn/entries 20130413/pki/redhat/ca-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ca-ui/config-ext/.svn/entries 20130413/pki/redhat/ca-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/.svn/entries 20130413/pki/redhat/ca-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ROOT/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/admin/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/admin/ca/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/admin/ca/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/admin/graphics/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/admin/graphics/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/agent/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/agent/.svn/entries
4c4
< 16073
---
> 16075
29c29
< ports.template
---
> index.template
35,39c35,39
< 2013-02-06T23:00:33.000000Z
< 52f2613da32880204c3afc596567c8a0
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 2013-04-02T21:34:49.000000Z
> cc0f83c4d5fb6ea1606787675bf9c8e1
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
61c61
< 4923
---
> 6282
63c63
< index.template
---
> ports.template
69,73c69,73
< 2013-04-02T21:34:49.000000Z
< cc0f83c4d5fb6ea1606787675bf9c8e1
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:33.000000Z
> 52f2613da32880204c3afc596567c8a0
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
95c95
< 6282
---
> 4923
202c202
< GenRejected.template
---
> funcs.js
208,212c208,212
< 2013-02-06T23:00:34.000000Z
< 0fc39aee3711c292c5156353befccb1e
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 2013-02-06T23:00:33.000000Z
> 8d9f355be16fa15d0beb7239789e5c0b
> 2012-09-19T19:04:45.610151Z
> 16055
> awnuk at REDHAT.COM
234c234
< 2693
---
> 20890
236c236
< funcs.js
---
> GenRejected.template
242,246c242,246
< 2013-02-06T23:00:33.000000Z
< 8d9f355be16fa15d0beb7239789e5c0b
< 2012-09-19T19:04:45.610151Z
< 16055
< awnuk at REDHAT.COM
---
> 2013-02-06T23:00:34.000000Z
> 0fc39aee3711c292c5156353befccb1e
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
268c268
< 20890
---
> 2693
270c270
< GenError.template
---
> xenroll.dll
277,280c277,280
< 6de8faeb10ee93ee37a153e36979acfb
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 8905cf1297282a015219792cf34de8ad
> 2007-05-17T21:47:41.386203Z
> 14777
> nkwan
302c302
< 2570
---
> 172664
304c304
< xenroll.dll
---
> GenError.template
311,314c311,314
< 8905cf1297282a015219792cf34de8ad
< 2007-05-17T21:47:41.386203Z
< 14777
< nkwan
---
> 6de8faeb10ee93ee37a153e36979acfb
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
336c336
< 172664
---
> 2570
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/agent/ca/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/agent/ca/.svn/entries
4c4
< 16073
---
> 16075
63c63
< frameSearch.html
---
> menuRevoke.html
70c70
< 6dc364b3f8b13e2ce25f020b6ff25b28
---
> f8c0ebdd820af2ab96f4e2d7fb4bbd10
95c95
< 1373
---
> 3247
97c97
< menuRevoke.html
---
> frameSearch.html
104c104
< f8c0ebdd820af2ab96f4e2d7fb4bbd10
---
> 6dc364b3f8b13e2ce25f020b6ff25b28
129c129
< 3247
---
> 1373
403c403
< ImportCert.template
---
> bulkissuance.template
410,413c410,413
< 1bf487827ed9e773d3b58aac5c26da34
< 2012-08-06T19:50:47.698850Z
< 16030
< awnuk at REDHAT.COM
---
> e1abc4e4bd27c104affc289a9b54ebd7
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
435c435
< 8043
---
> 970
437c437
< bulkissuance.template
---
> ImportCert.template
444,447c444,447
< e1abc4e4bd27c104affc289a9b54ebd7
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 1bf487827ed9e773d3b58aac5c26da34
> 2012-08-06T19:50:47.698850Z
> 16030
> awnuk at REDHAT.COM
469c469
< 970
---
> 8043
1287c1287
< notImplemented.html
---
> srchCert.template
1294,1297c1294,1297
< ab44f1b96cb5a7b039184496c379557b
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> e976edb0816716096a7137056d00e79c
> 2009-08-06T23:55:22.341380Z
> 15631
> awnuk at REDHAT.COM
1319c1319
< 1337
---
> 14942
1321c1321
< srchCert.template
---
> notImplemented.html
1328,1331c1328,1331
< e976edb0816716096a7137056d00e79c
< 2009-08-06T23:55:22.341380Z
< 15631
< awnuk at REDHAT.COM
---
> ab44f1b96cb5a7b039184496c379557b
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
1353c1353
< 14942
---
> 1337
1423c1423
< frameDir.html
---
> menuOCSP.html
1430c1430
< c902a0cb3158dec929bf6c6defe70885
---
> b037b3253662c656ee5eea60240643a2
1455c1455
< 1371
---
> 3453
1457c1457
< menuOCSP.html
---
> frameDir.html
1464c1464
< b037b3253662c656ee5eea60240643a2
---
> c902a0cb3158dec929bf6c6defe70885
1489c1489
< 3453
---
> 1371
1729c1729
< reasonToRevoke.template
---
> displayCRL.template
1735,1739c1735,1739
< 2013-02-06T23:00:32.000000Z
< 9c68ae91e3697fa0b79fbc62d1a12e49
< 2012-09-19T19:04:45.610151Z
< 16055
< awnuk at REDHAT.COM
---
> 2013-04-02T21:34:49.000000Z
> 347539a44ad2f822e3a5b69acdfa2a4f
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
1761c1761
< 17115
---
> 10242
1763c1763
< displayCRL.template
---
> reasonToRevoke.template
1769,1773c1769,1773
< 2013-04-02T21:34:49.000000Z
< 347539a44ad2f822e3a5b69acdfa2a4f
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:32.000000Z
> 9c68ae91e3697fa0b79fbc62d1a12e49
> 2012-09-19T19:04:45.610151Z
> 16055
> awnuk at REDHAT.COM
1795c1795
< 10242
---
> 17115
1865c1865
< UpdateDir.html
---
> frameDisplayCRL.html
1872,1875c1872,1875
< 838df36b0b6dc0ee2e1338566e127133
< 2011-05-20T19:21:13.897828Z
< 15885
< alee at REDHAT.COM
---
> edd5ad02580d5ccc7e2e8a14801b9600
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
1897c1897
< 11993
---
> 1402
1899c1899
< frameDisplayCRL.html
---
> UpdateDir.html
1906,1909c1906,1909
< edd5ad02580d5ccc7e2e8a14801b9600
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 838df36b0b6dc0ee2e1338566e127133
> 2011-05-20T19:21:13.897828Z
> 15885
> alee at REDHAT.COM
1931c1931
< 1402
---
> 11993
1967c1967
< displayCertFromRequest.template
---
> monitor.html
1974c1974
< 8691de88a52c5d6d414d64c503f827bc
---
> 36959c5b1f7e77c1923d6d0f9d417a80
1999c1999
< 5972
---
> 2693
2001c2001
< monitor.html
---
> displayCertFromRequest.template
2008c2008
< 36959c5b1f7e77c1923d6d0f9d417a80
---
> 8691de88a52c5d6d414d64c503f827bc
2033c2033
< 2693
---
> 5972
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/agent/graphics/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/agent/graphics/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/ee/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/ee/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/.svn/entries
4c4
< 16073
---
> 16075
539c539
< ProfileSubmit.template
---
> EnrollSuccess.template
546c546
< 2d70b22060a42c98b5e210db7fae3316
---
> d2ad389bcfef844ef52ff5196f42a29b
571c571
< 5578
---
> 9573
573c573
< EnrollSuccess.template
---
> ProfileSubmit.template
580c580
< d2ad389bcfef844ef52ff5196f42a29b
---
> 2d70b22060a42c98b5e210db7fae3316
605,608c605
< 9573
<
< policyEnrollment
< dir
---
> 5578
643a641,643
> policyEnrollment
> dir
>
647c647
< displayCaCert.template
---
> revocationMenu.html
654c654
< b658c608ff47b94b063783fe99d33bec
---
> 76b8b847bcd1aa30bc77ca6769a60c88
679c679
< 4756
---
> 1068
681c681
< revocationMenu.html
---
> displayCaCert.template
688c688
< 76b8b847bcd1aa30bc77ca6769a60c88
---
> b658c608ff47b94b063783fe99d33bec
713c713
< 1068
---
> 4756
783c783
< ProfileList.template
---
> requestStatus.template
790,793c790,793
< 1b00b083c1a7ea9ba184db1ec3d92dad
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 09dbddff4c5a0bfe6c07690dd2354a0d
> 2012-08-03T00:07:00.763807Z
> 16027
> awnuk at REDHAT.COM
815c815
< 2707
---
> 8676
817c817
< requestStatus.template
---
> ProfileList.template
824,827c824,827
< 09dbddff4c5a0bfe6c07690dd2354a0d
< 2012-08-03T00:07:00.763807Z
< 16027
< awnuk at REDHAT.COM
---
> 1b00b083c1a7ea9ba184db1ec3d92dad
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
849c849
< 8676
---
> 2707
953c953
< ImportAdminCert.template
---
> UserRevocation.html
959,963c959,963
< 2013-02-06T23:00:27.000000Z
< cc63ecf5fbd6c9dec53b75848322ab62
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 2013-04-02T21:34:48.000000Z
> 866980630741c16b163722fea37f3f67
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
985c985
< 2177
---
> 4608
987c987
< UserRevocation.html
---
> ImportAdminCert.template
993,997c993,997
< 2013-04-02T21:34:48.000000Z
< 866980630741c16b163722fea37f3f67
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:27.000000Z
> cc63ecf5fbd6c9dec53b75848322ab62
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
1019c1019
< 4608
---
> 2177
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/policyEnrollment/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/ee/ca/profileEnrollment/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ca-ui/shared/webapps/ca/ee/graphics/.svn/entries 20130413/pki/redhat/ca-ui/shared/webapps/ca/ee/graphics/.svn/entries
4c4
< 16073
---
> 16075
29c29
< gray90.gif
---
> folder.gif
36c36
< c1e51cedb40f481e48fe6a81ebdf6919
---
> a2b77438cc9a48f709fc32cec8eba45e
61c61
< 66
---
> 112
63c63
< folder.gif
---
> gray90.gif
70c70
< a2b77438cc9a48f709fc32cec8eba45e
---
> c1e51cedb40f481e48fe6a81ebdf6919
95c95
< 112
---
> 66
diff -r 20130410/pki/redhat/common/.svn/entries 20130413/pki/redhat/common/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common/config/.svn/entries 20130413/pki/redhat/common/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/common/config-ext/.svn/entries 20130413/pki/redhat/common/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/.svn/entries 20130413/pki/redhat/common-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/config/.svn/entries 20130413/pki/redhat/common-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/common-ui/config-ext/.svn/entries 20130413/pki/redhat/common-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/.svn/entries 20130413/pki/redhat/common-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/admin/.svn/entries 20130413/pki/redhat/common-ui/shared/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/admin/console/.svn/entries 20130413/pki/redhat/common-ui/shared/admin/console/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/admin/console/config/.svn/all-wcprops 20130413/pki/redhat/common-ui/shared/admin/console/config/.svn/all-wcprops
6c6
< hierarchypanel.vm
---
> certchainpanel.vm
10c10
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/hierarchypanel.vm
---
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certchainpanel.vm
12c12,30
< footer.vm
---
> databasepanel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 122
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/databasepanel.vm
> END
> config_clone.vm
> K 25
> svn:wc:ra_dav:version-url
> V 121
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_clone.vm
> END
> certrequestpanel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 125
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certrequestpanel.vm
> END
> header.vm
16c34
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/footer.vm
---
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/header.vm
18c36
< importcachainpanel.vm
---
> sizepanel.vm
21,22c39,40
< V 127
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/importcachainpanel.vm
---
> V 118
> /repos/pki/!svn/ver/16000/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/sizepanel.vm
24c42
< savepkcs12panel.vm
---
> restorekeycertpanel.vm
27,28c45,46
< V 124
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/savepkcs12panel.vm
---
> V 128
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/restorekeycertpanel.vm
30c48,54
< createsubsystempanel.vm
---
> wizard.vm
> K 25
> svn:wc:ra_dav:version-url
> V 115
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/wizard.vm
> END
> certprettyprintpanel.vm
34c58,64
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/createsubsystempanel.vm
---
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certprettyprintpanel.vm
> END
> savepkcs12panel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 124
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/savepkcs12panel.vm
53a84,95
> adminauthenticatepanel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 131
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
> END
> securitydomainloginpanel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 133
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
> END
60c102
< adminpanel.vm
---
> sidemenu.vm
63,64c105,106
< V 119
< /repos/pki/!svn/ver/16002/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/adminpanel.vm
---
> V 117
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/sidemenu.vm
72,78c114
< backupkeycertpanel.vm
< K 25
< svn:wc:ra_dav:version-url
< V 127
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/backupkeycertpanel.vm
< END
< config_hsm.vm
---
> welcomepanel.vm
81,82c117,118
< V 119
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_hsm.vm
---
> V 121
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/welcomepanel.vm
89a126,131
> agentauthenticatepanel.vm
> K 25
> svn:wc:ra_dav:version-url
> V 131
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
> END
96c138
< certchainpanel.vm
---
> importadmincertpanel.vm
99,100c141,142
< V 123
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certchainpanel.vm
---
> V 129
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/importadmincertpanel.vm
114,120c156
< config_clone.vm
< K 25
< svn:wc:ra_dav:version-url
< V 121
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_clone.vm
< END
< certrequestpanel.vm
---
> config_hsmloginpanel.vm
123,124c159,160
< V 125
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certrequestpanel.vm
---
> V 129
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
132,138c168
< header.vm
< K 25
< svn:wc:ra_dav:version-url
< V 115
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/header.vm
< END
< namepanel.vm
---
> hierarchypanel.vm
141,142c171,172
< V 118
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/namepanel.vm
---
> V 123
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/hierarchypanel.vm
144c174
< wizard.vm
---
> footer.vm
148c178
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/wizard.vm
---
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/footer.vm
156,180c186
< certprettyprintpanel.vm
< K 25
< svn:wc:ra_dav:version-url
< V 129
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/certprettyprintpanel.vm
< END
< adminauthenticatepanel.vm
< K 25
< svn:wc:ra_dav:version-url
< V 131
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/adminauthenticatepanel.vm
< END
< securitydomainloginpanel.vm
< K 25
< svn:wc:ra_dav:version-url
< V 133
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/securitydomainloginpanel.vm
< END
< sidemenu.vm
< K 25
< svn:wc:ra_dav:version-url
< V 117
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/sidemenu.vm
< END
< welcomepanel.vm
---
> namepanel.vm
183,184c189,190
< V 121
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/welcomepanel.vm
---
> V 118
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/namepanel.vm
186c192
< agentauthenticatepanel.vm
---
> importcachainpanel.vm
189,190c195,196
< V 131
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/agentauthenticatepanel.vm
---
> V 127
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/importcachainpanel.vm
192c198
< importadmincertpanel.vm
---
> createsubsystempanel.vm
196,202c202
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/importadmincertpanel.vm
< END
< databasepanel.vm
< K 25
< svn:wc:ra_dav:version-url
< V 122
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/databasepanel.vm
---
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/createsubsystempanel.vm
204c204
< config_hsmloginpanel.vm
---
> adminpanel.vm
207,208c207,208
< V 129
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_hsmloginpanel.vm
---
> V 119
> /repos/pki/!svn/ver/16002/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/adminpanel.vm
210c210
< sizepanel.vm
---
> backupkeycertpanel.vm
213,214c213,214
< V 118
< /repos/pki/!svn/ver/16000/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/sizepanel.vm
---
> V 127
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/backupkeycertpanel.vm
216c216
< restorekeycertpanel.vm
---
> config_hsm.vm
219,220c219,220
< V 128
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/restorekeycertpanel.vm
---
> V 119
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/common-ui/shared/admin/console/config/config_hsm.vm
diff -r 20130410/pki/redhat/common-ui/shared/admin/console/config/.svn/entries 20130413/pki/redhat/common-ui/shared/admin/console/config/.svn/entries
97c97
< importcachainpanel.vm
---
> namepanel.vm
104,107c104,107
< 8478eacd0f398ace3a9da32ebea1774c
< 2009-05-13T01:39:31.073526Z
< 15492
< mharmsen at REDHAT.COM
---
> e593f5594ef351870739c36210dd7854
> 2009-02-27T17:49:21.091588Z
> 15433
> alee at REDHAT.COM
129c129
< 2133
---
> 3795
131c131
< savepkcs12panel.vm
---
> xml.vm
138,141c138,141
< 1377c99e43f731e990dc1dab65575207
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 4ba759406bd097c46db558c58becea0c
> 2011-01-20T23:10:17.714646Z
> 15835
> mharmsen at REDHAT.COM
163c163
< 1608
---
> 875
165c165
< createsubsystempanel.vm
---
> importcachainpanel.vm
172,174c172,174
< 38ef3a4b2e2aebc611d32cb2215c397d
< 2009-05-07T22:41:45.790133Z
< 15483
---
> 8478eacd0f398ace3a9da32ebea1774c
> 2009-05-13T01:39:31.073526Z
> 15492
197c197
< 3559
---
> 2133
199c199
< modulepanel.vm
---
> createsubsystempanel.vm
206,209c206,209
< 5f6cfc03dbaf7e3768f1d8fc0527023f
< 2010-10-04T16:42:14.502918Z
< 15814
< cfu at REDHAT.COM
---
> 38ef3a4b2e2aebc611d32cb2215c397d
> 2009-05-07T22:41:45.790133Z
> 15483
> mharmsen at REDHAT.COM
231c231
< 6587
---
> 3559
233c233
< donepanel.vm
---
> adminpanel.vm
240,242c240,242
< 6f531ce2008a83fae4617810d794beda
< 2012-08-17T23:47:03.220073Z
< 16035
---
> 364b43c407571aa5511f98b5221af94f
> 2012-03-06T01:17:57.577853Z
> 16002
265c265
< 2829
---
> 6892
267c267
< displaycertchainpanel.vm
---
> backupkeycertpanel.vm
274c274
< ec4791d93e0f7be12a92d37a42f7c159
---
> d90eb10ecb25b61ed0ba482fded8da43
299c299
< 1517
---
> 2571
301c301
< login.vm
---
> config_hsm.vm
308c308
< 51b584fda834aebc24645776305a8d2c
---
> 9c03ac1c24ec08dbf6d381c4b6fe3f7b
333c333
< 2971
---
> 4580
335c335
< adminpanel.vm
---
> certchainpanel.vm
342,345c342,345
< 364b43c407571aa5511f98b5221af94f
< 2012-03-06T01:17:57.577853Z
< 16002
< awnuk at REDHAT.COM
---
> 55ae1a017dd413c77e6aa6bab28a28b3
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
367c367
< 6892
---
> 1472
369c369
< config_db.vm
---
> databasepanel.vm
376,378c376,378
< 01f81c628b83f7b6d0b5feb3077f3909
< 2010-11-24T17:17:48.765841Z
< 15831
---
> 28e236d90ff55bf5b8c0cfa8e8b3f2be
> 2011-03-09T07:10:59.316217Z
> 15839
401c401
< 4340
---
> 4010
403c403
< backupkeycertpanel.vm
---
> config_clone.vm
410,413c410,413
< d90eb10ecb25b61ed0ba482fded8da43
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 7621e438ac042716133c5454a42b055d
> 2010-11-24T17:17:48.765841Z
> 15831
> alee at REDHAT.COM
435c435
< 2571
---
> 3918
437c437
< config_hsm.vm
---
> certrequestpanel.vm
444,447c444,447
< 9c03ac1c24ec08dbf6d381c4b6fe3f7b
< 2010-11-24T17:17:48.765841Z
< 15831
< alee at REDHAT.COM
---
> b03f869ddca1a40e1e18d3700c567d14
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
469c469
< 4580
---
> 7491
471c471
< config_rootca.vm
---
> header.vm
478,481c478,481
< 87c986d47717285a4e522c4f2a0135f9
< 2010-11-24T17:17:48.765841Z
< 15831
< alee at REDHAT.COM
---
> b5f91da6e08de42b5839fc44404ef3ed
> 2009-03-25T23:56:04.292449Z
> 15454
> mharmsen at REDHAT.COM
503c503
< 3333
---
> 1228
505c505
< securitydomainpanel.vm
---
> sizepanel.vm
511,515c511,515
< 2013-02-06T23:00:37.000000Z
< 566486e14ce17b81a36bc6a15280d6e8
< 2009-06-01T20:35:47.594177Z
< 15532
< mharmsen at REDHAT.COM
---
> 2013-04-12T04:24:43.000000Z
> 9c8cedc69d51048540aa5456d7bc7208
> 2012-02-29T19:02:40.367564Z
> 16000
> awnuk at REDHAT.COM
537c537
< 4496
---
> 20297
539c539
< certchainpanel.vm
---
> restorekeycertpanel.vm
546,549c546,549
< 55ae1a017dd413c77e6aa6bab28a28b3
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> fcdad5dfa8aa39bab5058035cf21b5dc
> 2010-10-07T19:21:04.755038Z
> 15815
> alee at REDHAT.COM
571c571
< 1472
---
> 2402
573c573
< config_join.vm
---
> wizard.vm
580c580
< 772dcafb9c2391da35ff71c4618c94d9
---
> 7c5904ec9953615f55cbb2a19b33d249
605c605
< 4111
---
> 3604
607c607
< config_clone.vm
---
> certprettyprintpanel.vm
614,617c614,617
< 7621e438ac042716133c5454a42b055d
< 2010-11-24T17:17:48.765841Z
< 15831
< alee at REDHAT.COM
---
> 779c4dcbeede45e95c773aa4834c1a8f
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
639c639
< 3918
---
> 1481
641c641
< config_addhsm.vm
---
> savepkcs12panel.vm
648,651c648,651
< db6b8039e207cb6a4c6335b447c5c4a8
< 2010-11-24T17:17:48.765841Z
< 15831
< alee at REDHAT.COM
---
> 1377c99e43f731e990dc1dab65575207
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
673c673
< 2830
---
> 1608
675c675
< certrequestpanel.vm
---
> modulepanel.vm
682,685c682,685
< b03f869ddca1a40e1e18d3700c567d14
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 5f6cfc03dbaf7e3768f1d8fc0527023f
> 2010-10-04T16:42:14.502918Z
> 15814
> cfu at REDHAT.COM
707c707
< 7491
---
> 6587
709c709
< topmenu.vm
---
> donepanel.vm
716,719c716,719
< 6672a85c98bea86b1db87930091322df
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 6f531ce2008a83fae4617810d794beda
> 2012-08-17T23:47:03.220073Z
> 16035
> awnuk at REDHAT.COM
741c741
< 920
---
> 2829
743c743
< header.vm
---
> displaycertchainpanel.vm
750,753c750,753
< b5f91da6e08de42b5839fc44404ef3ed
< 2009-03-25T23:56:04.292449Z
< 15454
< mharmsen at REDHAT.COM
---
> ec4791d93e0f7be12a92d37a42f7c159
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
775c775
< 1228
---
> 1517
777c777
< xml.vm
---
> adminauthenticatepanel.vm
784,786c784,786
< 4ba759406bd097c46db558c58becea0c
< 2011-01-20T23:10:17.714646Z
< 15835
---
> b7cc3dd868e9fae12d677a9cebd90ae8
> 2009-02-12T18:41:07.051725Z
> 15418
809c809
< 875
---
> 1745
811c811
< wizard.vm
---
> securitydomainloginpanel.vm
818c818
< 7c5904ec9953615f55cbb2a19b33d249
---
> ef3b318da33ea64d9b9ff0a8329882f9
843c843
< 3604
---
> 3904
845c845
< namepanel.vm
---
> login.vm
852,854c852,854
< e593f5594ef351870739c36210dd7854
< 2009-02-27T17:49:21.091588Z
< 15433
---
> 51b584fda834aebc24645776305a8d2c
> 2010-11-24T17:17:48.765841Z
> 15831
877c877
< 3795
---
> 2971
879c879
< certprettyprintpanel.vm
---
> sidemenu.vm
886c886
< 779c4dcbeede45e95c773aa4834c1a8f
---
> 5c1de1a72ab13bb89f1550afe887055f
911c911
< 1481
---
> 1213
913c913
< adminauthenticatepanel.vm
---
> config_db.vm
920,923c920,923
< b7cc3dd868e9fae12d677a9cebd90ae8
< 2009-02-12T18:41:07.051725Z
< 15418
< mharmsen at REDHAT.COM
---
> 01f81c628b83f7b6d0b5feb3077f3909
> 2010-11-24T17:17:48.765841Z
> 15831
> alee at REDHAT.COM
945c945
< 1745
---
> 4340
947c947
< securitydomainloginpanel.vm
---
> welcomepanel.vm
954,957c954,957
< ef3b318da33ea64d9b9ff0a8329882f9
< 2010-11-24T17:17:48.765841Z
< 15831
< alee at REDHAT.COM
---
> e44540d15915662d4d57d67e9c485a4a
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
979c979
< 3904
---
> 2438
981c981
< sidemenu.vm
---
> config_rootca.vm
988,991c988,991
< 5c1de1a72ab13bb89f1550afe887055f
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 87c986d47717285a4e522c4f2a0135f9
> 2010-11-24T17:17:48.765841Z
> 15831
> alee at REDHAT.COM
1013c1013
< 1213
---
> 3333
1015c1015
< welcomepanel.vm
---
> agentauthenticatepanel.vm
1022,1025c1022,1025
< e44540d15915662d4d57d67e9c485a4a
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 6572df1a9cb20512e76fb60c2125d878
> 2009-02-12T18:41:07.051725Z
> 15418
> mharmsen at REDHAT.COM
1047c1047
< 2438
---
> 1663
1049c1049
< agentauthenticatepanel.vm
---
> securitydomainpanel.vm
1056,1058c1056,1058
< 6572df1a9cb20512e76fb60c2125d878
< 2009-02-12T18:41:07.051725Z
< 15418
---
> 566486e14ce17b81a36bc6a15280d6e8
> 2009-06-01T20:35:47.594177Z
> 15532
1081c1081
< 1663
---
> 4496
1117c1117
< databasepanel.vm
---
> config_join.vm
1124,1126c1124,1126
< 28e236d90ff55bf5b8c0cfa8e8b3f2be
< 2011-03-09T07:10:59.316217Z
< 15839
---
> 772dcafb9c2391da35ff71c4618c94d9
> 2010-11-24T17:17:48.765841Z
> 15831
1149c1149
< 4010
---
> 4111
1151c1151
< config_hsmloginpanel.vm
---
> config_addhsm.vm
1158,1161c1158,1161
< b61e13d13f01d865592bde79cd1a7ce2
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> db6b8039e207cb6a4c6335b447c5c4a8
> 2010-11-24T17:17:48.765841Z
> 15831
> alee at REDHAT.COM
1183c1183
< 2118
---
> 2830
1185c1185
< sizepanel.vm
---
> config_hsmloginpanel.vm
1192,1195c1192,1195
< 9c8cedc69d51048540aa5456d7bc7208
< 2012-02-29T19:02:40.367564Z
< 16000
< awnuk at REDHAT.COM
---
> b61e13d13f01d865592bde79cd1a7ce2
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
1217c1217
< 20297
---
> 2118
1219c1219
< restorekeycertpanel.vm
---
> topmenu.vm
1226,1229c1226,1229
< fcdad5dfa8aa39bab5058035cf21b5dc
< 2010-10-07T19:21:04.755038Z
< 15815
< alee at REDHAT.COM
---
> 6672a85c98bea86b1db87930091322df
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
1251c1251
< 2402
---
> 920
Only in 20130410/pki/redhat/common-ui/shared/admin/console/config: importadmincertpanel.vm.mlh
diff -r 20130410/pki/redhat/common-ui/shared/admin/console/img/.svn/entries 20130413/pki/redhat/common-ui/shared/admin/console/img/.svn/entries
4c4
< 16073
---
> 16075
29c29
< icon_crit_update.gif
---
> no-certificate.png
36c36
< 780c4b270412345e20be4a12d6c84f25
---
> 85d95ce8ae7d081d5cebfa4d2c0248a7
61c61
< 337
---
> 2342
97c97
< no-certificate.png
---
> icon_crit_update.gif
104c104
< 85d95ce8ae7d081d5cebfa4d2c0248a7
---
> 780c4b270412345e20be4a12d6c84f25
129c129
< 2342
---
> 337
437c437
< key.png
---
> lock.png
444c444
< c397aa889b75fb227f23f75544686873
---
> e258fd173069e299a56d155fbd4ffbdd
469c469
< 1753
---
> 1453
471c471
< lock.png
---
> key.png
478c478
< e258fd173069e299a56d155fbd4ffbdd
---
> c397aa889b75fb227f23f75544686873
503c503
< 1453
---
> 1753
diff -r 20130410/pki/redhat/common-ui/shared/admin/console/js/.svn/entries 20130413/pki/redhat/common-ui/shared/admin/console/js/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/css/.svn/entries 20130413/pki/redhat/common-ui/shared/css/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/common-ui/shared/img/.svn/entries 20130413/pki/redhat/common-ui/shared/img/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/config-ext/.svn/entries 20130413/pki/redhat/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console/.svn/entries 20130413/pki/redhat/console/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console/config/.svn/entries 20130413/pki/redhat/console/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/console/config-ext/.svn/entries 20130413/pki/redhat/console/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/.svn/entries 20130413/pki/redhat/console-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/config/.svn/entries 20130413/pki/redhat/console-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/console-ui/config-ext/.svn/entries 20130413/pki/redhat/console-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/.svn/entries 20130413/pki/redhat/console-ui/src/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/.svn/entries 20130413/pki/redhat/console-ui/src/com/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/admin/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/admin/certsrv/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/admin/certsrv/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/admin/certsrv/theme/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/admin/certsrv/theme/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/management/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/management/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/management/client/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/management/client/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/management/client/theme/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/management/client/theme/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/console-ui/src/com/netscape/management/client/theme/images/.svn/entries 20130413/pki/redhat/console-ui/src/com/netscape/management/client/theme/images/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/java-tools/.svn/entries 20130413/pki/redhat/java-tools/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/java-tools/config/.svn/entries 20130413/pki/redhat/java-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/java-tools/config-ext/.svn/entries 20130413/pki/redhat/java-tools/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra/.svn/entries 20130413/pki/redhat/kra/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra/config/.svn/entries 20130413/pki/redhat/kra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/kra/config-ext/.svn/entries 20130413/pki/redhat/kra/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/.svn/entries 20130413/pki/redhat/kra-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/config/.svn/entries 20130413/pki/redhat/kra-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/kra-ui/config-ext/.svn/entries 20130413/pki/redhat/kra-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/.svn/entries 20130413/pki/redhat/kra-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/ROOT/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/kra/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/kra/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/kra/agent/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/kra/agent/.svn/entries
4c4
< 16073
---
> 16075
165c165
< GenRejected.template
---
> funcs.js
172,175c172,175
< 34bf0b53649637f2f1b6235357bb5769
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 6d4545a3c379731b30c89981ce8f1ff7
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
197c197
< 2678
---
> 19526
199c199
< funcs.js
---
> GenRejected.template
206,209c206,209
< 6d4545a3c379731b30c89981ce8f1ff7
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 34bf0b53649637f2f1b6235357bb5769
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
231c231
< 19526
---
> 2678
406c406
< GenSuccess.template
---
> helpfun.js
413,416c413,416
< dcf94c3823a72b4f65ac087f402ae313
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 372afafac5cd20f96bb3180f688acf9b
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
438c438
< 1635
---
> 1117
440c440
< helpfun.js
---
> GenSuccess.template
447,450c447,450
< 372afafac5cd20f96bb3180f688acf9b
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> dcf94c3823a72b4f65ac087f402ae313
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
472c472
< 1117
---
> 1635
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/kra/agent/graphics/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/kra/agent/graphics/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/kra-ui/shared/webapps/kra/agent/kra/.svn/entries 20130413/pki/redhat/kra-ui/shared/webapps/kra/agent/kra/.svn/entries
4c4
< 16073
---
> 16075
573c573
< ListRequests.html
---
> displayBySerial.template
580c580
< c55e03ac0c41b73ff27ca301b9e86b10
---
> a1d8a1ee05ce09eba00549e88c72895f
605c605
< 3569
---
> 5361
607c607
< displayBySerial.template
---
> ListRequests.html
614c614
< a1d8a1ee05ce09eba00549e88c72895f
---
> c55e03ac0c41b73ff27ca301b9e86b10
639c639
< 5361
---
> 3569
743c743
< queryKey.template
---
> confirmRecoverBySerial.template
749,753c749,753
< 2013-04-02T21:34:46.000000Z
< 8e44db5a2c96cbd51ec416b9e247c563
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:20.000000Z
> b1851d57503d3a28081b4cabfa938ca6
> 2007-05-17T22:47:22.839594Z
> 14783
> nkwan
775c775
< 7722
---
> 2249
777c777
< confirmRecoverBySerial.template
---
> queryKey.template
783,787c783,787
< 2013-02-06T23:00:20.000000Z
< b1851d57503d3a28081b4cabfa938ca6
< 2007-05-17T22:47:22.839594Z
< 14783
< nkwan
---
> 2013-04-02T21:34:46.000000Z
> 8e44db5a2c96cbd51ec416b9e247c563
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
809c809
< 2249
---
> 7722
913c913
< processReq.template
---
> displayBySerialForRecovery.template
920c920
< ecb1ba1b1c00398efc3a5cdb677cfa49
---
> 9580de93413161adb690400b1225d8ba
945c945
< 12527
---
> 10795
947c947
< displayBySerialForRecovery.template
---
> processReq.template
954c954
< 9580de93413161adb690400b1225d8ba
---
> ecb1ba1b1c00398efc3a5cdb677cfa49
979c979
< 10795
---
> 12527
1015c1015
< grantAsyncRecovery.template
---
> getApprovalStatus.template
1022,1025c1022,1025
< 9f9e83f497f807302d0f6797ca07a6a7
< 2010-03-18T20:55:17.352743Z
< 15744
< cfu at REDHAT.COM
---
> fdf83c597f93c43e4f2143e10849267b
> 2007-05-17T22:47:22.839594Z
> 14783
> nkwan
1047c1047
< 1427
---
> 3708
1049c1049
< getApprovalStatus.template
---
> grantAsyncRecovery.template
1056,1059c1056,1059
< fdf83c597f93c43e4f2143e10849267b
< 2007-05-17T22:47:22.839594Z
< 14783
< nkwan
---
> 9f9e83f497f807302d0f6797ca07a6a7
> 2010-03-18T20:55:17.352743Z
> 15744
> cfu at REDHAT.COM
1081c1081
< 3708
---
> 1427
diff -r 20130410/pki/redhat/manage/.svn/entries 20130413/pki/redhat/manage/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/manage/config/.svn/entries 20130413/pki/redhat/manage/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/manage/config-ext/.svn/entries 20130413/pki/redhat/manage/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/migrate/.svn/all-wcprops 20130413/pki/redhat/migrate/.svn/all-wcprops
4c4,10
< /repos/pki/!svn/ver/16058/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/migrate
---
> /repos/pki/!svn/ver/16074/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/migrate
> END
> pki-migrate.spec
> K 25
> svn:wc:ra_dav:version-url
> V 92
> /repos/pki/!svn/ver/16074/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/migrate/pki-migrate.spec
30,35d35
< pki-migrate.spec
< K 25
< svn:wc:ra_dav:version-url
< V 92
< /repos/pki/!svn/ver/16058/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/migrate/pki-migrate.spec
< END
diff -r 20130410/pki/redhat/migrate/.svn/entries 20130413/pki/redhat/migrate/.svn/entries
4c4
< 16073
---
> 16075
10,12c10,12
< 2012-10-15T23:12:40.249096Z
< 16058
< cfu at REDHAT.COM
---
> 2013-04-10T13:42:53.844212Z
> 16074
> alee at REDHAT.COM
35,39c35,39
< 2013-04-08T21:31:10.000000Z
< 273cfdb64f70a11b8b650590df50edf6
< 2012-10-15T23:12:40.249096Z
< 16058
< cfu at REDHAT.COM
---
> 2013-04-11T02:45:33.000000Z
> 1c1e352d66aa3b7626ed96e260470a2a
> 2013-04-10T13:42:53.844212Z
> 16074
> alee at REDHAT.COM
61c61
< 15973
---
> 16177
diff -r 20130410/pki/redhat/migrate/.svn/text-base/pki-migrate.spec.svn-base 20130413/pki/redhat/migrate/.svn/text-base/pki-migrate.spec.svn-base
37c37
< %define base_release 10%{?base_build_tag}
---
> %define base_release 11%{?base_build_tag}
268a269
> %attr(-,root,root) %{_datadir}/%{base_prefix}/%{base_component}/80To81/81schema.ldif
275a277,279
> * Mon Apr 8 2013 Ade Lee <alee at redhat.com> 8.1.0-11
> - Bugzilla Bug #707069 - In-place migration from 8.1 to 8.1.2
>
diff -r 20130410/pki/redhat/migrate/config/.svn/entries 20130413/pki/redhat/migrate/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/migrate/config-ext/.svn/all-wcprops 20130413/pki/redhat/migrate/config-ext/.svn/all-wcprops
5a6,11
> build_rhel4_pki
> K 25
> svn:wc:ra_dav:version-url
> V 94
> /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/config-ext/build_rhel4_pki
> END
36,41d41
< build_rhel4_pki
< K 25
< svn:wc:ra_dav:version-url
< V 94
< /repos/pki/!svn/ver/15907/branches/PKI_8_1_ERRATA_BRANCH/pki/redhat/config-ext/build_rhel4_pki
< END
diff -r 20130410/pki/redhat/migrate/config-ext/.svn/entries 20130413/pki/redhat/migrate/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/migrate/pki-migrate.spec 20130413/pki/redhat/migrate/pki-migrate.spec
37c37
< %define base_release 10%{?base_build_tag}
---
> %define base_release 11%{?base_build_tag}
268a269
> %attr(-,root,root) %{_datadir}/%{base_prefix}/%{base_component}/80To81/81schema.ldif
275a277,279
> * Mon Apr 8 2013 Ade Lee <alee at redhat.com> 8.1.0-11
> - Bugzilla Bug #707069 - In-place migration from 8.1 to 8.1.2
>
diff -r 20130410/pki/redhat/native-tools/.svn/entries 20130413/pki/redhat/native-tools/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/native-tools/config/.svn/entries 20130413/pki/redhat/native-tools/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/native-tools/config-ext/.svn/entries 20130413/pki/redhat/native-tools/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp/.svn/entries 20130413/pki/redhat/ocsp/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp/config/.svn/entries 20130413/pki/redhat/ocsp/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ocsp/config-ext/.svn/entries 20130413/pki/redhat/ocsp/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/.svn/entries 20130413/pki/redhat/ocsp-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/config/.svn/entries 20130413/pki/redhat/ocsp-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ocsp-ui/config-ext/.svn/entries 20130413/pki/redhat/ocsp-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/ROOT/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/ocsp/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/ocsp/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/.svn/entries
4c4
< 16073
---
> 16075
29c29
< ports.template
---
> index.template
35,39c35,39
< 2013-02-06T23:00:03.000000Z
< 46c311ab6a0354de32ae5228ac66a2c5
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 2013-04-02T21:34:44.000000Z
> 19a38066fcf105157fd97411bc475394
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
61c61
< 4929
---
> 6290
63c63
< index.template
---
> ports.template
69,73c69,73
< 2013-04-02T21:34:44.000000Z
< 19a38066fcf105157fd97411bc475394
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:03.000000Z
> 46c311ab6a0354de32ae5228ac66a2c5
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
95c95
< 6290
---
> 4929
199c199
< funcs.js
---
> GenRejected.template
206,209c206,209
< 6d4545a3c379731b30c89981ce8f1ff7
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 5bfd3a26ad9efc39cf00fcb8e63c5315
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
231c231
< 19526
---
> 2679
233c233
< GenRejected.template
---
> funcs.js
240,243c240,243
< 5bfd3a26ad9efc39cf00fcb8e63c5315
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 6d4545a3c379731b30c89981ce8f1ff7
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
265c265
< 2679
---
> 19526
338,340d337
< ocsp
< dir
<
374a372,374
> ocsp
> dir
>
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/graphics/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/graphics/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/ocsp/.svn/entries 20130413/pki/redhat/ocsp-ui/shared/webapps/ocsp/agent/ocsp/.svn/entries
4c4
< 16073
---
> 16075
233c233
< menuOCSP.html
---
> AddCRL.html
239,243c239,243
< 2013-02-06T23:00:03.000000Z
< fd7dc667b8fdf8e7cd03e1eeb268775c
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 2013-04-02T21:34:44.000000Z
> 287b5879641e448b4e4876dbf99bad45
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
265c265
< 2267
---
> 2927
267c267
< AddCRL.html
---
> menuOCSP.html
273,277c273,277
< 2013-04-02T21:34:44.000000Z
< 287b5879641e448b4e4876dbf99bad45
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:03.000000Z
> fd7dc667b8fdf8e7cd03e1eeb268775c
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
299c299
< 2927
---
> 2267
diff -r 20130410/pki/redhat/osutil/.svn/entries 20130413/pki/redhat/osutil/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/osutil/config/.svn/entries 20130413/pki/redhat/osutil/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/osutil/config-ext/.svn/entries 20130413/pki/redhat/osutil/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra/.svn/entries 20130413/pki/redhat/ra/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra/config/.svn/entries 20130413/pki/redhat/ra/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ra/config-ext/.svn/entries 20130413/pki/redhat/ra/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/.svn/entries 20130413/pki/redhat/ra-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/config/.svn/entries 20130413/pki/redhat/ra-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/ra-ui/config-ext/.svn/entries 20130413/pki/redhat/ra-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/.svn/entries 20130413/pki/redhat/ra-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/admin/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/admin/group/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/admin/group/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/admin/user/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/admin/user/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/agent/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/agent/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/agent/cert/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/agent/cert/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/agent/request/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/agent/request/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/css/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/css/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/agent/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/agent/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/request/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/request/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/scep/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/scep/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/server/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/server/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ee/user/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ee/user/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/images/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/images/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/console/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/console/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/console/config/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/console/config/.svn/entries
4c4
< 16073
---
> 16075
641c641
< header.vm
---
> displaycertchain2panel.vm
648,651c648,651
< 84ba049391a2546314411d1a4d1c4830
< 2009-03-25T23:56:04.292449Z
< 15454
< mharmsen at REDHAT.COM
---
> 668f85e99516e3ed6b61914c93357525
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
673c673
< 1190
---
> 1469
675c675
< displaycertchain2panel.vm
---
> header.vm
682,685c682,685
< 668f85e99516e3ed6b61914c93357525
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 84ba049391a2546314411d1a4d1c4830
> 2009-03-25T23:56:04.292449Z
> 15454
> mharmsen at REDHAT.COM
707c707
< 1469
---
> 1190
743c743
< wizard.vm
---
> namepanel.vm
750,753c750,753
< 77c00473ba5ca493e6c319aec9c565e6
< 2009-06-18T01:26:17.158558Z
< 15555
< mharmsen at REDHAT.COM
---
> ebe1d82cfcd777e12a890c038e4c3e0f
> 2009-02-27T17:49:21.091588Z
> 15433
> alee at REDHAT.COM
775c775
< 3350
---
> 3000
811c811
< namepanel.vm
---
> wizard.vm
818,821c818,821
< ebe1d82cfcd777e12a890c038e4c3e0f
< 2009-02-27T17:49:21.091588Z
< 15433
< alee at REDHAT.COM
---
> 77c00473ba5ca493e6c319aec9c565e6
> 2009-06-18T01:26:17.158558Z
> 15555
> mharmsen at REDHAT.COM
843c843
< 3000
---
> 3350
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/console/css/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/console/css/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/console/img/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/console/img/.svn/entries
4c4
< 16073
---
> 16075
29c29
< icon_crit_update.gif
---
> no-certificate.png
36c36
< 780c4b270412345e20be4a12d6c84f25
---
> 85d95ce8ae7d081d5cebfa4d2c0248a7
61c61
< 337
---
> 2342
97c97
< no-certificate.png
---
> icon_crit_update.gif
104c104
< 85d95ce8ae7d081d5cebfa4d2c0248a7
---
> 780c4b270412345e20be4a12d6c84f25
129c129
< 2342
---
> 337
233c233
< button-clear.gif
---
> pki-icon-home.gif
240c240
< 275ffc87e2e657909eb3c7f2325d3087
---
> b7152f4a6665d99f9a8e6cf303ffa0ad
265c265
< 647
---
> 657
301c301
< pki-icon-home.gif
---
> button-clear.gif
308c308
< b7152f4a6665d99f9a8e6cf303ffa0ad
---
> 275ffc87e2e657909eb3c7f2325d3087
333c333
< 657
---
> 647
335c335
< button-manage.gif
---
> pki-icon-software.gif
342c342
< 75ebc12a210642bcc5c9a601ddb8ad7b
---
> 2c256345e90fd8502d2f086ca04ca170
367c367
< 776
---
> 1146
403c403
< pki-icon-software.gif
---
> button-manage.gif
410c410
< 2c256345e90fd8502d2f086ca04ca170
---
> 75ebc12a210642bcc5c9a601ddb8ad7b
435c435
< 1146
---
> 776
diff -r 20130410/pki/redhat/ra-ui/shared/docroot/ra/admin/console/js/.svn/entries 20130413/pki/redhat/ra-ui/shared/docroot/ra/admin/console/js/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/scripts/.svn/entries 20130413/pki/redhat/scripts/.svn/entries
4c4
< 16073
---
> 16075
Only in 20130413/pki/redhat/scripts: typescript
diff -r 20130410/pki/redhat/selinux/.svn/entries 20130413/pki/redhat/selinux/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/selinux/config/.svn/entries 20130413/pki/redhat/selinux/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/selinux/config-ext/.svn/entries 20130413/pki/redhat/selinux/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/setup/.svn/entries 20130413/pki/redhat/setup/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/setup/config/.svn/entries 20130413/pki/redhat/setup/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/setup/config-ext/.svn/entries 20130413/pki/redhat/setup/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/silent/.svn/entries 20130413/pki/redhat/silent/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/silent/config/.svn/entries 20130413/pki/redhat/silent/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/silent/config-ext/.svn/entries 20130413/pki/redhat/silent/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/symkey/.svn/entries 20130413/pki/redhat/symkey/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/symkey/config/.svn/entries 20130413/pki/redhat/symkey/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/symkey/config-ext/.svn/entries 20130413/pki/redhat/symkey/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks/.svn/entries 20130413/pki/redhat/tks/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks/config/.svn/entries 20130413/pki/redhat/tks/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/tks/config-ext/.svn/entries 20130413/pki/redhat/tks/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/.svn/entries 20130413/pki/redhat/tks-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/config/.svn/entries 20130413/pki/redhat/tks-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/tks-ui/config-ext/.svn/entries 20130413/pki/redhat/tks-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/.svn/entries 20130413/pki/redhat/tks-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/ROOT/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/ROOT/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/tks/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/tks/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/tks/agent/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/tks/agent/.svn/entries
4c4
< 16073
---
> 16075
29c29
< ports.template
---
> index.template
35,39c35,39
< 2013-02-06T23:00:41.000000Z
< d1f9b9cfffd30fedd73b5553c287e59a
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 2013-04-02T21:34:50.000000Z
> 6ab3d15fb56722f9376fec4b9a26ed9f
> 2013-03-25T13:54:52.957655Z
> 16066
> alee at REDHAT.COM
61c61
< 4926
---
> 6286
63c63
< index.template
---
> ports.template
69,73c69,73
< 2013-04-02T21:34:50.000000Z
< 6ab3d15fb56722f9376fec4b9a26ed9f
< 2013-03-25T13:54:52.957655Z
< 16066
< alee at REDHAT.COM
---
> 2013-02-06T23:00:41.000000Z
> d1f9b9cfffd30fedd73b5553c287e59a
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
95c95
< 6286
---
> 4926
199c199
< funcs.js
---
> GenRejected.template
206,209c206,209
< 6d4545a3c379731b30c89981ce8f1ff7
< 2007-09-22T01:46:24.363575Z
< 15102
< nkwan
---
> 70fcb9af3ce04f91b0c9c9046690d59b
> 2010-08-04T06:57:05.648720Z
> 15780
> mharmsen at REDHAT.COM
231c231
< 19526
---
> 2678
233c233
< GenRejected.template
---
> funcs.js
240,243c240,243
< 70fcb9af3ce04f91b0c9c9046690d59b
< 2010-08-04T06:57:05.648720Z
< 15780
< mharmsen at REDHAT.COM
---
> 6d4545a3c379731b30c89981ce8f1ff7
> 2007-09-22T01:46:24.363575Z
> 15102
> nkwan
265c265
< 2678
---
> 19526
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/tks/agent/graphics/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/tks/agent/graphics/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tks-ui/shared/webapps/tks/agent/tks/.svn/entries 20130413/pki/redhat/tks-ui/shared/webapps/tks/agent/tks/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps/.svn/entries 20130413/pki/redhat/tps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps/config/.svn/entries 20130413/pki/redhat/tps/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/tps/config-ext/.svn/entries 20130413/pki/redhat/tps/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/.svn/entries 20130413/pki/redhat/tps-ui/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/config/.svn/entries 20130413/pki/redhat/tps-ui/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/tps-ui/config-ext/.svn/entries 20130413/pki/redhat/tps-ui/config-ext/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/.svn/entries 20130413/pki/redhat/tps-ui/shared/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/cgi-bin/.svn/entries 20130413/pki/redhat/tps-ui/shared/cgi-bin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/cgi-bin/demo/.svn/entries 20130413/pki/redhat/tps-ui/shared/cgi-bin/demo/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/cgi-bin/home/.svn/entries 20130413/pki/redhat/tps-ui/shared/cgi-bin/home/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/cgi-bin/so/.svn/entries 20130413/pki/redhat/tps-ui/shared/cgi-bin/so/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/cgi-bin/sow/.svn/entries 20130413/pki/redhat/tps-ui/shared/cgi-bin/sow/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/css/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/css/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/demo/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/demo/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/home/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/home/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/images/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/images/.svn/entries
4c4
< 16073
---
> 16075
97c97
< PadLock.gif
---
> SuspendButton.gif
104c104
< edfc38bca9d4a3418670f0fa0b4f5b1b
---
> 3a80169353184fc8e064f6eef682df52
129c129
< 136
---
> 1425
131c131
< SuspendButton.gif
---
> PadLock.gif
138c138
< 3a80169353184fc8e064f6eef682df52
---
> edfc38bca9d4a3418670f0fa0b4f5b1b
163c163
< 1425
---
> 136
165c165
< NetKeyLogo.gif
---
> ContinueButton.gif
172c172
< 10e710158d8052338d756813b73535db
---
> 8c38956081d90872c56876071b6de86d
197c197
< 426
---
> 1457
199c199
< ContinueButton.gif
---
> NetKeyLogo.gif
206c206
< 8c38956081d90872c56876071b6de86d
---
> 10e710158d8052338d756813b73535db
231c231
< 1457
---
> 426
335c335
< NetKeyProgress.gif
---
> HelpButton.gif
342c342
< 6f5dd5b6feaa9e4b9cbd73ff24c25967
---
> 67b9c4b710ede79dd41d9b887b2e48ef
367c367
< 7018
---
> 1279
403c403
< HelpButton.gif
---
> NetKeyProgress.gif
410c410
< 67b9c4b710ede79dd41d9b887b2e48ef
---
> 6f5dd5b6feaa9e4b9cbd73ff24c25967
435c435
< 1279
---
> 7018
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/so/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/so/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/so/images/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/so/images/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/sow/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/sow/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/sow/css/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/sow/css/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/sow/images/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/sow/images/.svn/entries
4c4
< 16073
---
> 16075
29c29
< indicator.gif
---
> prevlabel.gif
36c36
< 081a85491616ca381e7b7a847ab9e4cf
---
> d935f4acf56e0b83218bbdb5835e4e23
61c61
< 701
---
> 371
97c97
< prevlabel.gif
---
> indicator.gif
104c104
< d935f4acf56e0b83218bbdb5835e4e23
---
> 081a85491616ca381e7b7a847ab9e4cf
129c129
< 371
---
> 701
131c131
< Nside.jpg
---
> loading.gif
138c138
< 17a0efa301d4e8e5645ba2b11300199c
---
> 7e99e1159a3686f6aa4f90043c554483
163c163
< 3713
---
> 2767
165c165
< loading.gif
---
> Nside.jpg
172c172
< 7e99e1159a3686f6aa4f90043c554483
---
> 17a0efa301d4e8e5645ba2b11300199c
197c197
< 2767
---
> 3713
199c199
< next.gif
---
> nextlabel.gif
206c206
< 804543daa860e91aabe9ba634e64ed2b
---
> 485d89b62f7af7f0ce9427bb9a636e7e
231c231
< 305
---
> 354
233c233
< nextlabel.gif
---
> next.gif
240c240
< 485d89b62f7af7f0ce9427bb9a636e7e
---
> 804543daa860e91aabe9ba634e64ed2b
265c265
< 354
---
> 305
335c335
< bg_grad.gif
---
> right_bg.gif
342c342
< 0f64980ab8c2c098f7a324eac167e02c
---
> 2ea45f9630a354a2bc36663d5f8d6f5c
367c367
< 829
---
> 1275
403c403
< right_bg.gif
---
> bg_grad.gif
410c410
< 2ea45f9630a354a2bc36663d5f8d6f5c
---
> 0f64980ab8c2c098f7a324eac167e02c
435c435
< 1275
---
> 829
471c471
< Untitled-3.gif
---
> thumb-1.jpg
478c478
< 7dca4cba342f610c5aa0d30693c3fa84
---
> 9b1b923cd76561359f8886033a4f5848
503c503
< 1145
---
> 2874
505c505
< thumb-1.jpg
---
> Untitled-3.gif
512c512
< 9b1b923cd76561359f8886033a4f5848
---
> 7dca4cba342f610c5aa0d30693c3fa84
537c537
< 2874
---
> 1145
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/esc/sow/js/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/esc/sow/js/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tokendb/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tokendb/.svn/entries
4c4
< 16073
---
> 16075
641c641
< showAdmin.template
---
> new.template
648,650c648,650
< f9ac27d2a01f3a07e176b21452bed3a2
< 2009-07-01T17:12:57.607616Z
< 15564
---
> 52341553e54442a415904b8f20f4ab4b
> 2011-03-28T18:43:33.119303Z
> 15849
673c673
< 10997
---
> 2967
675c675
< new.template
---
> showAdmin.template
682,684c682,684
< 52341553e54442a415904b8f20f4ab4b
< 2011-03-28T18:43:33.119303Z
< 15849
---
> f9ac27d2a01f3a07e176b21452bed3a2
> 2009-07-01T17:12:57.607616Z
> 15564
707c707
< 2967
---
> 10997
743c743
< revoke.template
---
> searchActivityAdmin.template
750,753c750,753
< 2edb29304a428751094307dd9d398376
< 2009-07-01T17:12:57.607616Z
< 15564
< alee at REDHAT.COM
---
> 0cbe63d5b4077a797795078a00e73add
> 2009-06-18T01:26:17.158558Z
> 15555
> mharmsen at REDHAT.COM
775c775
< 12253
---
> 3638
777c777
< searchActivityAdmin.template
---
> revoke.template
784,787c784,787
< 0cbe63d5b4077a797795078a00e73add
< 2009-06-18T01:26:17.158558Z
< 15555
< mharmsen at REDHAT.COM
---
> 2edb29304a428751094307dd9d398376
> 2009-07-01T17:12:57.607616Z
> 15564
> alee at REDHAT.COM
809c809
< 3638
---
> 12253
913c913
< selfTestResults.template
---
> editConfig.template
920,923c920,923
< d0a3e13090ab00bb6cf3f9f4655c42de
< 2010-08-16T23:18:25.657475Z
< 15799
< awnuk at REDHAT.COM
---
> 352584a5ddc4a9b858ae3f38d67d88a3
> 2010-11-01T20:19:56.691345Z
> 15825
> alee at REDHAT.COM
945c945
< 4471
---
> 8958
947c947
< editConfig.template
---
> selfTestResults.template
954,957c954,957
< 352584a5ddc4a9b858ae3f38d67d88a3
< 2010-11-01T20:19:56.691345Z
< 15825
< alee at REDHAT.COM
---
> d0a3e13090ab00bb6cf3f9f4655c42de
> 2010-08-16T23:18:25.657475Z
> 15799
> awnuk at REDHAT.COM
979c979
< 8958
---
> 4471
1015c1015
< auditAdmin.template
---
> agentViewConfig.template
1022,1024c1022,1024
< 65aa01bc25907c3a8f44e6d11e030879
< 2010-01-25T20:31:10.087455Z
< 15718
---
> c0b72c0659c1574ccc43f668ec33b031
> 2010-11-01T20:19:56.691345Z
> 15825
1047c1047
< 8541
---
> 6538
1049c1049
< agentViewConfig.template
---
> auditAdmin.template
1056,1058c1056,1058
< c0b72c0659c1574ccc43f668ec33b031
< 2010-11-01T20:19:56.691345Z
< 15825
---
> 65aa01bc25907c3a8f44e6d11e030879
> 2010-01-25T20:31:10.087455Z
> 15718
1081c1081
< 6538
---
> 8541
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/admin/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/admin/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/admin/console/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/admin/console/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/admin/console/config/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/admin/console/config/.svn/entries
4c4
< 16073
---
> 16075
641c641
< displaycertchain2panel.vm
---
> header.vm
648c648
< 757e86f2278b8341562dd4f3423dfbb5
---
> ab87b521f1fdafd0cde2372f7e469fbe
673c673
< 1485
---
> 1245
675c675
< header.vm
---
> displaycertchain2panel.vm
682c682
< ab87b521f1fdafd0cde2372f7e469fbe
---
> 757e86f2278b8341562dd4f3423dfbb5
707c707
< 1245
---
> 1485
743c743
< wizard.vm
---
> namepanel.vm
750,752c750,752
< 813ee4eadc6ebe579dacc61cd78a234f
< 2009-06-18T01:26:17.158558Z
< 15555
---
> be520ea86f4311acd47fb03337d041dd
> 2009-03-25T23:56:04.292449Z
> 15454
775c775
< 3501
---
> 3016
811c811
< namepanel.vm
---
> wizard.vm
818,820c818,820
< be520ea86f4311acd47fb03337d041dd
< 2009-03-25T23:56:04.292449Z
< 15454
---
> 813ee4eadc6ebe579dacc61cd78a234f
> 2009-06-18T01:26:17.158558Z
> 15555
843c843
< 3016
---
> 3501
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/admin/console/img/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/admin/console/img/.svn/entries
4c4
< 16073
---
> 16075
29c29
< icon_crit_update.gif
---
> id.png
36c36
< 780c4b270412345e20be4a12d6c84f25
---
> 0e7d74d28d6a32582d0f9b6c211b4bb9
61c61
< 337
---
> 1604
97c97
< id.png
---
> icon_crit_update.gif
104c104
< 0e7d74d28d6a32582d0f9b6c211b4bb9
---
> 780c4b270412345e20be4a12d6c84f25
129c129
< 1604
---
> 337
131c131
< icon_checkin.gif
---
> icon_up2date.gif
138c138
< 9db09afb885f049c9060378e090fb37d
---
> e78feb0776e7143e5f4dec201d994845
163c163
< 225
---
> 226
165c165
< icon_up2date.gif
---
> icon_checkin.gif
172c172
< e78feb0776e7143e5f4dec201d994845
---
> 9db09afb885f049c9060378e090fb37d
197c197
< 226
---
> 225
403c403
< button-clear.gif
---
> pki-icon-home.gif
410c410
< 275ffc87e2e657909eb3c7f2325d3087
---
> b7152f4a6665d99f9a8e6cf303ffa0ad
435c435
< 647
---
> 657
471c471
< pki-icon-home.gif
---
> button-clear.gif
478c478
< b7152f4a6665d99f9a8e6cf303ffa0ad
---
> 275ffc87e2e657909eb3c7f2325d3087
503c503
< 657
---
> 647
diff -r 20130410/pki/redhat/tps-ui/shared/docroot/tps/admin/console/js/.svn/entries 20130413/pki/redhat/tps-ui/shared/docroot/tps/admin/console/js/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/util/.svn/entries 20130413/pki/redhat/util/.svn/entries
4c4
< 16073
---
> 16075
diff -r 20130410/pki/redhat/util/config/.svn/entries 20130413/pki/redhat/util/config/.svn/entries
4c4
< 2554
---
> 2564
diff -r 20130410/pki/redhat/util/config-ext/.svn/entries 20130413/pki/redhat/util/config-ext/.svn/entries
4c4
< 16073
---
> 16075
More information about the Pki-devel
mailing list