Merge r4661: We need to update the master-process pid in the shmlog after we daemon()'ize.

Spotted by:     Mark Moseley



git-svn-id: http://www.varnish-cache.org/svn/branches/2.1@4687 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/common.h

@@ -43,6 +43,7 @@ void VSL_Panic(int *len, char **ptr);
 
 /* shmlog.c */
 void VSL_MgtInit(const char *fn, unsigned size);
+void VSL_MgtPid(void);
 extern struct varnish_stats *VSL_stats;
 
 /* varnishd.c */

bin/varnishd/shmlog.c

@@ -413,3 +413,10 @@ VSL_MgtInit(const char *fn, unsigned size)
 	*pp = *params;
 	params = pp;
 }
+
+void
+VSL_MgtPid(void)
+{
+
+	loghead->master_pid = getpid();
+}

bin/varnishd/varnishd.c

@@ -674,6 +674,8 @@ main(int argc, char * const *argv)
 	if (!d_flag && !F_flag)
 		AZ(varnish_daemon(1, 0));
 
+	VSL_MgtPid();
+
 	if (pfh != NULL && vpf_write(pfh))
 		fprintf(stderr, "NOTE: Could not write PID file\n");