diff options
| author | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-07-06 20:07:33 +0000 |
|---|---|---|
| committer | mharmsen <mharmsen@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-07-06 20:07:33 +0000 |
| commit | 5e95c6ac3fcdaade85ddde733d93e86c62b2e320 (patch) | |
| tree | 002f97c77cb3e11cc08fdd50d76dbfe63fea2fb2 /pki/base/java-tools | |
| parent | b85caf78b618b289a6040ee0eec95f8c605c8344 (diff) | |
| download | pki-5e95c6ac3fcdaade85ddde733d93e86c62b2e320.tar.gz pki-5e95c6ac3fcdaade85ddde733d93e86c62b2e320.tar.xz pki-5e95c6ac3fcdaade85ddde733d93e86c62b2e320.zip | |
Bugzilla Bug #532548 - Tool to do DRM re-key (tweaks)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2043 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/java-tools')
| -rw-r--r-- | pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java index f327337d3..91fa7c05e 100644 --- a/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java +++ b/pki/base/java-tools/src/com/netscape/cmstools/DRMTool.java @@ -2757,9 +2757,15 @@ public class DRMTool String next_line = null; // extract the data - input = line.substring( - DRM_LDIF_EXTDATA_REQUEST_NOTES.length() + 1 - ).trim(); + if( line.length() > DRM_LDIF_EXTDATA_REQUEST_NOTES.length() ) { + input = line.substring( + DRM_LDIF_EXTDATA_REQUEST_NOTES.length() + 1 + ).trim(); + } else { + input = line.substring( + DRM_LDIF_EXTDATA_REQUEST_NOTES.length() + ).trim(); + } while( ( line = ldif_record.next() ) != null ) { if( line.startsWith( SPACE ) ) { @@ -3887,6 +3893,12 @@ public class DRMTool } else { output = line; } + } else if( record_type.equals( DRM_LDIF_RECORD ) ) { + // Non-Request / Non-Key Record: + // Pass through the original + // 'serialno' line UNCHANGED + // so that it is ALWAYS written + output = line; } else { log( "ERROR: Mismatched record field='" + DRM_LDIF_SERIAL_NO |