diff --git a/docs/en_US/release_notes_6_15.rst b/docs/en_US/release_notes_6_15.rst index 84ef4d6cd..5f66e6d5a 100644 --- a/docs/en_US/release_notes_6_15.rst +++ b/docs/en_US/release_notes_6_15.rst @@ -29,6 +29,7 @@ Bug fixes ********* | `Issue #5101 `_ - Ensure consistent orderings for ACLS when comparing schemas in the schema diff. + | `Issue #5133 `_ - Fixed an exception occur while taking backup and SSL certificates/keys are not found in the specified path. | `Issue #5145 `_ - Fixed intermittent error shown while OAuth2 login. | `Issue #5167 `_ - Ensure that the path to the psqlrc file is correct when multiple users open the PSQL tool at the same time. | `Issue #5188 `_ - Ensure that the continue/start button should be disabled if the user stops the Debugger for the procedures. diff --git a/web/pgadmin/misc/bgprocess/processes.py b/web/pgadmin/misc/bgprocess/processes.py index 5d4f76702..521ce8c30 100644 --- a/web/pgadmin/misc/bgprocess/processes.py +++ b/web/pgadmin/misc/bgprocess/processes.py @@ -802,12 +802,15 @@ class BatchProcess(object): # Set SSL related ENV variables if server.sslcert and server.sslkey and server.sslrootcert: # SSL environment variables + sslcert = get_complete_file_path(server.sslcert) + sslkey = get_complete_file_path(server.sslkey) + sslrootcert = get_complete_file_path(server.sslrootcert) + self.env['PGSSLMODE'] = server.ssl_mode - self.env['PGSSLCERT'] = get_complete_file_path(server.sslcert) - self.env['PGSSLKEY'] = get_complete_file_path(server.sslkey) - self.env['PGSSLROOTCERT'] = get_complete_file_path( - server.sslrootcert - ) + self.env['PGSSLCERT'] = '' if sslcert is None else sslcert + self.env['PGSSLKEY'] = '' if sslkey is None else sslkey + self.env['PGSSLROOTCERT'] = \ + '' if sslrootcert is None else sslrootcert # Set service name related ENV variable if server.service: