Mercurial > dovecot > core-2.2
changeset 12482:28db9b177087
master: Use t_askpass() for getting the manual SSL key password.
author | Timo Sirainen <tss@iki.fi> |
---|---|
date | Tue, 30 Nov 2010 00:13:45 +0000 |
parents | 6ea1671108f1 |
children | 719ce27f9955 |
files | src/master/common.h src/master/main.c |
diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/common.h Tue Nov 30 00:12:54 2010 +0000 +++ b/src/master/common.h Tue Nov 30 00:13:45 2010 +0000 @@ -8,7 +8,7 @@ extern uid_t master_uid; extern gid_t master_gid; extern bool core_dumps_disabled; -extern char ssl_manual_key_password[]; +extern const char *ssl_manual_key_password; extern int null_fd; extern struct service_list *services;
--- a/src/master/main.c Tue Nov 30 00:12:54 2010 +0000 +++ b/src/master/main.c Tue Nov 30 00:13:45 2010 +0000 @@ -41,7 +41,7 @@ uid_t master_uid; gid_t master_gid; bool core_dumps_disabled; -char ssl_manual_key_password[100]; +const char *ssl_manual_key_password; int null_fd; struct service_list *services; @@ -715,9 +715,8 @@ set = master_settings_read(); if (ask_key_pass) { - askpass("Give the password for SSL keys: ", - ssl_manual_key_password, - sizeof(ssl_manual_key_password)); + ssl_manual_key_password = + t_askpass("Give the password for SSL keys: "); } if (dup2(null_fd, STDIN_FILENO) < 0 ||