From 4ef46445d2ce12f63b4440b43ae69dcfa01a8675 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 30 Nov 2010 00:13:45 +0000 Subject: [PATCH] master: Use t_askpass() for getting the manual SSL key password. --- src/master/common.h | 2 +- src/master/main.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/master/common.h b/src/master/common.h index ff01b0c33a..ee7fc8beec 100644 --- a/src/master/common.h +++ b/src/master/common.h @@ -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; diff --git a/src/master/main.c b/src/master/main.c index 2d862a07da..350c9ca241 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -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 @@ int main(int argc, char *argv[]) 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 || -- 2.47.3