Added separate CLI option for client database password.

Previously the -w option is used to specify the password for
either the username/password authentication or client database
password to do client certificate authentication. Since the
passwords now may be used at the same time, a new -c option
has been added for the client database password.

1 files changed, 16 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/certsrv/client/ClientConfig.java b/base/common/src/com/netscape/certsrv/client/ClientConfig.java
index 885b60a26..6be7abae2 100644
--- a/base/common/src/com/netscape/certsrv/client/ClientConfig.java
+++ b/base/common/src/com/netscape/certsrv/client/ClientConfig.java
@@ -52,6 +52,7 @@ public class ClientConfig {
 
     String certDatabase;
     String certNickname;
+    String certPassword;
     String username;
     String password;
 
@@ -86,6 +87,15 @@ public class ClientConfig {
         this.certNickname = certNickname;
     }
 
+    @XmlElement(name="CertPassword")
+    public String getCertPassword() {
+        return certPassword;
+    }
+
+    public void setCertPassword(String certPassword) {
+        this.certPassword = certPassword;
+    }
+
     @XmlElement(name="Username")
     public String getUsername() {
         return username;
@@ -110,6 +120,7 @@ public class ClientConfig {
         int result = 1;
         result = prime * result + ((certDatabase == null) ? 0 : certDatabase.hashCode());
         result = prime * result + ((certNickname == null) ? 0 : certNickname.hashCode());
+        result = prime * result + ((certPassword == null) ? 0 : certPassword.hashCode());
         result = prime * result + ((password == null) ? 0 : password.hashCode());
         result = prime * result + ((serverURI == null) ? 0 : serverURI.hashCode());
         result = prime * result + ((username == null) ? 0 : username.hashCode());
@@ -135,6 +146,11 @@ public class ClientConfig {
                 return false;
         } else if (!certNickname.equals(other.certNickname))
             return false;
+        if (certPassword == null) {
+            if (other.certPassword != null)
+                return false;
+        } else if (!certPassword.equals(other.certPassword))
+            return false;
         if (password == null) {
             if (other.password != null)
                 return false;