diff options
| author | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2016-06-24 14:39:59 -0600 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-06-28 17:42:33 -0600 |
| commit | 00ac032c8995756f5bfdaab5a7f6ae441ac7dda3 (patch) | |
| tree | cdd5976c7e48fc37af60bdc38ab077c7a782621e /base/server/python | |
| parent | 8598a68ac954d1020f4e0063e257a20512961567 (diff) | |
| download | pki-00ac032c8995756f5bfdaab5a7f6ae441ac7dda3.tar.gz pki-00ac032c8995756f5bfdaab5a7f6ae441ac7dda3.tar.xz pki-00ac032c8995756f5bfdaab5a7f6ae441ac7dda3.zip | |
Normalize default softokn name
- PKI TRAC Ticket #2311 - When pki_token_name=Internal,
consider normalizing it to "internal"
Diffstat (limited to 'base/server/python')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index b1fc21310..dc5d7f636 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -1181,6 +1181,11 @@ class PKIConfigParser: # self.mdict['pki_clone_pkcs12_path'] # self.mdict['pki_clone_uri'] # self.mdict['pki_security_domain_https_port'] + # + # The following variables are established via the specified PKI + # deployment configuration file and potentially "normalized" + # below: + # # self.mdict['pki_token_name'] # # The following variables are established via the specified PKI @@ -1191,6 +1196,11 @@ class PKIConfigParser: # self.mdict['pki_issuing_ca'] # + # if the case insensitive softokn name is the 'default' value + if (self.mdict['pki_token_name'].lower() == "internal"): + # always normalize 'default' softokn name + self.mdict['pki_token_name'] = "internal" + # if security domain user is not defined if not len(self.mdict['pki_security_domain_user']): |