From 2e42abff660e67db37666fb36784207d333120b7 Mon Sep 17 00:00:00 2001 From: Wouter Verhelst Date: Thu, 9 Jun 2011 16:16:44 +0200 Subject: [PATCH] Fix a few branch checks There were still two errors in the ifs in negotiate() that made 'make check fail'. It works again now. --- nbd-server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nbd-server.c b/nbd-server.c index 133bc7e..144d3d0 100644 --- a/nbd-server.c +++ b/nbd-server.c @@ -1390,11 +1390,11 @@ CLIENT* negotiate(int net, CLIENT *client, GArray* servers, int phase) { } if (write(net, &magic, sizeof(magic)) < 0) { err_nonfatal("Negotiation failed: %m"); - if(client) + if(phase & NEG_OLD) exit(EXIT_FAILURE); } } - if(phase & NEG_MODERN) { + if ((phase & NEG_MODERN) && (phase & NEG_INIT)) { /* modern */ uint32_t reserved; uint32_t opt; -- 1.7.10.4