dovecot-2.0: master: Use t_askpass() for getting the manual SSL ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/28db9b177087
changeset: 12482:28db9b177087
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Nov 30 00:13:45 2010 +0000
description:
master: Use t_askpass() for getting the manual SSL key password.

diffstat:

 src/master/common.h |  2 +-
 src/master/main.c   |  7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r 6ea1671108f1 -r 28db9b177087 src/master/common.h
--- 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;
 
diff -r 6ea1671108f1 -r 28db9b177087 src/master/main.c
--- 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 ||