master: Use t_askpass() for getting the manual SSL key password.

diff --git a/src/master/common.h b/src/master/common.h
index ff01b0c33ae882c2e0e8a6265e68ee850ba990b3..ee7fc8beeceb37228b8d71cde52745643df1532c 100644 (file)
--- 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 2d862a07daee897610be8dd8810e8a0b33939550..350c9ca2415b62fee69ffbe09617484c382d8902 100644 (file)
--- 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 ||