write pid file immediately after daemonizing

Since we split daemonizing from changing directory in commit da9b292
(f025de005d719201a69ad0313d545a1ddd244752 in release/2.3), we can
now simply write the pid file immediately after daemonizing.

This not only fixes the bug reported in trac #563, but also further
simplifies the code.

trac #563

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1434665325-3225-1-git-send-email-steffan@karger.me>
URL: http://article.gmane.org/gmane.network.openvpn.devel/9793
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 659eae7b79e5565bb0c93f6d6d04e2163fea1141)

diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index c99e775e59892682085e7b093decf836bba91042..7a2c69bdbb38db992276b202f578363c03fe9b9c 100644 (file)
--- a/src/openvpn/init.c
+++ b/src/openvpn/init.c
@@ -2775,16 +2775,10 @@ do_init_first_time (struct context *c)
        platform_group_get (c->options.groupname, &c0->platform_state_group) |
        platform_user_get (c->options.username, &c0->platform_state_user);
 
-      /* get --writepid file descriptor */
-      get_pid_file (c->options.writepid, &c0->pid_state);
-
       /* perform postponed chdir if --daemon */
       if (c->did_we_daemonize && c->options.cd_dir == NULL)
        platform_chdir("/");
 
-      /* save process ID in a file */
-      write_pid (&c0->pid_state);
-
       /* should we change scheduling priority? */
       platform_nice (c->options.nice);
     }

diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c
index 8408438be13cc68c0310dea22684bed660da6eb1..8e78117201fbb9896385968083d94962414db2d5 100644 (file)
--- a/src/openvpn/misc.c
+++ b/src/openvpn/misc.c
@@ -127,30 +127,21 @@ run_up_down (const char *command,
   gc_free (&gc);
 }
 
-/* Get the file we will later write our process ID to */
+/* Write our PID to a file */
 void
-get_pid_file (const char* filename, struct pid_state *state)
+write_pid (const char *filename)
 {
-  CLEAR (*state);
   if (filename)
     {
-      state->fp = platform_fopen (filename, "w");
-      if (!state->fp)
+      unsigned int pid = 0;
+      FILE *fp = platform_fopen (filename, "w");
+      if (!fp)
        msg (M_ERR, "Open error on pid file %s", filename);
-      state->filename = filename;
-    }
-}
 
-/* Write our PID to a file */
-void
-write_pid (const struct pid_state *state)
-{
-  if (state->filename && state->fp)
-    {
-      unsigned int pid = platform_getpid (); 
-      fprintf(state->fp, "%u\n", pid);
-      if (fclose (state->fp))
-       msg (M_ERR, "Close error on pid file %s", state->filename);
+      pid = platform_getpid ();
+      fprintf(fp, "%u\n", pid);
+      if (fclose (fp))
+       msg (M_ERR, "Close error on pid file %s", filename);
     }
 }
 

diff --git a/src/openvpn/misc.h b/src/openvpn/misc.h
index 183898e322be0dd829d2b506cf4953798c3df36d..e67b5e4e8e6d4d82b31d28d11ed6eb4169242bb1 100644 (file)
--- a/src/openvpn/misc.h
+++ b/src/openvpn/misc.h
@@ -73,14 +73,7 @@ void run_up_down (const char *command,
                  const char *script_type,
                  struct env_set *es);
 
-/* workspace for get_pid_file/write_pid */
-struct pid_state {
-  FILE *fp;
-  const char *filename;
-};
-
-void get_pid_file (const char* filename, struct pid_state *state);
-void write_pid (const struct pid_state *state);
+void write_pid (const char *filename);
 
 /* check file protections */
 void warn_if_group_others_accessible(const char* filename);

diff --git a/src/openvpn/openvpn.c b/src/openvpn/openvpn.c
index 2f327f36706d55fe60d9b873ff325afc68b40742..00bd5703c36ec6ca7ddce4f4f4af942dd13ce6a1 100644 (file)
--- a/src/openvpn/openvpn.c
+++ b/src/openvpn/openvpn.c
@@ -231,7 +231,10 @@ openvpn_main (int argc, char *argv[])
          
          /* become a daemon if --daemon */
          if (c.first_time)
-           c.did_we_daemonize = possibly_become_daemon (&c.options);
+           {
+             c.did_we_daemonize = possibly_become_daemon (&c.options);
+             write_pid (c.options.writepid);
+           }
 
 #ifdef ENABLE_MANAGEMENT
          /* open management subsystem */

diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h
index bdfa6852aa2e8a8e831353d42412a04db14f965c..10ec85987edd0706facbaefbb4bbdd960dae1c03 100644 (file)
--- a/src/openvpn/openvpn.h
+++ b/src/openvpn/openvpn.h
@@ -137,9 +137,6 @@ struct context_persist
  */
 struct context_0
 {
-  /* workspace for get_pid_file/write_pid */
-  struct pid_state pid_state;
-
   /* workspace for --user/--group */
   bool uid_gid_specified;
   bool uid_gid_set;