Ticket #574: passwd_daemon-fail-2.3.7.patch

src/openvpn/init.c

@@ -407 +407 @@
 /*
  * 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)
 {
 #ifdef ENABLE_CRYPTO
   /* Certificate password input */
@@ -502 +502 @@
 
   init_connection_list (c);
 
-  init_query_passwords (c);
-
 #if defined(ENABLE_PKCS11)
   if (c->first_time) {
     int i;

src/openvpn/init.h

@@ -62 +62 @@
 void init_instance_handle_signals (struct context *c, const struct env_set *env, const unsigned int flags);
 
 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,

src/openvpn/openvpn.c

@@ -229 +229 @@
           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)
             {