Include issuer DN in CertDataInfo

Now that Dogtag can host multiple CAs in a single instance, indicate
the issuer DN in the CertDataInfo structure that is returned for
certificate searches.

Fixes: https://fedorahosted.org/pki/ticket/2322

1 files changed, 16 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/certsrv/cert/CertDataInfo.java b/base/common/src/com/netscape/certsrv/cert/CertDataInfo.java
index 88903547c..a73cb5e3a 100644
--- a/base/common/src/com/netscape/certsrv/cert/CertDataInfo.java
+++ b/base/common/src/com/netscape/certsrv/cert/CertDataInfo.java
@@ -61,6 +61,7 @@ public class CertDataInfo {
 
     CertId id;
     String subjectDN;
+    String issuerDN;
     String status;
     String type;
     Integer version;
@@ -92,6 +93,15 @@ public class CertDataInfo {
         this.subjectDN = subjectDN;
     }
 
+    @XmlElement(name="IssuerDN")
+    public String getIssuerDN() {
+        return issuerDN;
+    }
+
+    public void setIssuerDN(String issuerDN) {
+        this.issuerDN = issuerDN;
+    }
+
     @XmlElement(name="Status")
     public String getStatus() {
         return status;
@@ -199,6 +209,7 @@ public class CertDataInfo {
         result = prime * result + ((notValidBefore == null) ? 0 : notValidBefore.hashCode());
         result = prime * result + ((status == null) ? 0 : status.hashCode());
         result = prime * result + ((subjectDN == null) ? 0 : subjectDN.hashCode());
+        result = prime * result + ((issuerDN == null) ? 0 : issuerDN.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
         result = prime * result + ((version == null) ? 0 : version.hashCode());
         return result;
@@ -263,6 +274,11 @@ public class CertDataInfo {
                 return false;
         } else if (!subjectDN.equals(other.subjectDN))
             return false;
+        if (issuerDN == null) {
+            if (other.issuerDN != null) return false;
+        } else if (!issuerDN.equals(other.issuerDN)) {
+            return false;
+        }
         if (type == null) {
             if (other.type != null)
                 return false;