From: Luis R. Rodriguez <mcgrof@suse.com>
Date: Sat, 26 Jul 2014 02:14:15 +0000 (-0700)
Subject: cxenstored: also fail if only 1 socket was given by systemd
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4588
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bdc74c9aa5b0c9d540414c10e216aa585bce6851;p=xen.git

cxenstored: also fail if only 1 socket was given by systemd

Reported-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 7f72f68da9..4eaff5752f 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1770,7 +1770,7 @@ static void xen_claim_active_sockets(int **psock, int **pro_sock)
 			   strerror(errno),
 			   errno);
 		barf_perror("sd_listen_fds() failed\n");
-	} else if (n > 2) {
+	} else if (n != 2) {
 		fprintf(stderr, SD_ERR "Expected 2 fds but given %d\n", n);
 		sd_notifyf(0, "STATUS=Mismatch on number (2): %s\n"
 			   "ERRNO=%d",