@@ -389,8 +389,8 @@ next_connection_entry (struct context *c)

 /*

  * Query for private key and auth-user-pass username/passwords

  */

-static void

-init_query_passwords (struct context *c)

+void

+init_query_passwords (const struct context *c)

 {

 #if defined(ENABLE_CRYPTO) && defined(ENABLE_SSL)

   /* Certificate password input */

@@ -520,8 +520,6 @@ context_init_1 (struct context *c)

   init_connection_list (c);

-  init_query_passwords (c);

-

 #if defined(ENABLE_PKCS11)

   if (c->first_time) {

     int i;

@@ -63,6 +63,11 @@ void init_instance_handle_signals (struct context *c, const struct env_set *env,

 void init_instance (struct context *c, const struct env_set *env, const unsigned int flags);

+/**

+ * Query for private key and auth-user-pass username/passwords.

+ */

+void init_query_passwords (const struct context *c);

+

 void do_route (const struct options *options,

 	       struct route_list *route_list,

 	       struct route_ipv6_list *route_ipv6_list,

@@ -228,7 +228,10 @@ openvpn_main (int argc, char *argv[])

 	  /* test crypto? */

 	  if (do_test_crypto (&c.options))

 	    break;

-	  

+

+	  /* Query passwords before becoming a daemon */

+	  init_query_passwords (&c);

+

 	  /* become a daemon if --daemon */

 	  if (c.first_time)

 	    {