From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-5345-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 768 invoked by alias); 16 Mar 2012 21:30:54 -0000
Received: (qmail 751 invoked by uid 9796); 16 Mar 2012 21:30:54 -0000
Date: Fri, 16 Mar 2012 21:30:00 -0000
Message-ID: <20120316213054.749.qmail@sourceware.org>
From: prajnoha@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdaemon/server daemon-server.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2012-03/txt/msg00124.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	prajnoha@sourceware.org	2012-03-16 21:30:54

Modified files:
	libdaemon/server: daemon-server.c 

Log message:
	Do exit if LISTEN_PID environment variable not correct during systemd handover.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdaemon/server/daemon-server.c.diff?cvsroot=lvm2&r1=1.5&r2=1.6

--- LVM2/libdaemon/server/daemon-server.c	2012/03/14 15:51:52	1.5
+++ LVM2/libdaemon/server/daemon-server.c	2012/03/16 21:30:53	1.6
@@ -177,7 +177,7 @@
 	env_pid = strtoul(e, &p, 10);
 	if (errno || !p || *p || env_pid <= 0 ||
 	    getpid() != (pid_t) env_pid)
-		;
+		goto out;
 
 	/* LISTEN_FDS must be 1 and the fd must be a socket! */
 	if (!(e = getenv(SD_LISTEN_FDS_ENV_VAR_NAME)))