Mercurial > dovecot > original-hg > dovecot-1.2
diff src/master/login-process.c @ 3889:c7462001227b HEAD
Added support for password protected SSL private keys. The password can be
given in dovecot.conf, or when dovecot is started with -p parameter.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 15 Jan 2006 15:16:53 +0200 |
| parents | 928229f8b3e6 |
| children | 0ae5f5b468b7 |
line wrap: on
line diff
--- a/src/master/login-process.c Sun Jan 15 14:35:01 2006 +0200 +++ b/src/master/login-process.c Sun Jan 15 15:16:53 2006 +0200 @@ -404,6 +404,11 @@ env_put("DOVECOT_MASTER=1"); if (!set->ssl_disable) { + const char *ssl_key_password = NULL; + + ssl_key_password = set->ssl_key_password != NULL ? + set->ssl_key_password : ssl_manual_key_password; + if (set->ssl_ca_file != NULL) { env_put(t_strconcat("SSL_CA_FILE=", set->ssl_ca_file, NULL)); @@ -412,6 +417,8 @@ set->ssl_cert_file, NULL)); env_put(t_strconcat("SSL_KEY_FILE=", set->ssl_key_file, NULL)); + env_put(t_strconcat("SSL_KEY_PASSWORD=", + ssl_key_password, NULL)); env_put(t_strconcat("SSL_PARAM_FILE=", set->ssl_parameters_file, NULL)); if (set->ssl_cipher_list != NULL) {