From: Richard Jones <rjones@redhat.com>
Date: Thu, 8 Apr 2010 17:53:40 +0000 (+0100)
Subject: Fix for "warning: unexpected connection from UID ..."
X-Git-Tag: 1.2.1~5
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=08ddf6b1d9b6c19c87b82a44d5e0fffd70e41635;p=libguestfs.git

Fix for "warning: unexpected connection from UID ..."

This warning is currently a fatal error.  The code attempts
to retry the accept call, but because we don't reset sock = -1
the retry doesn't happen and it dies anyway.

Set sock = -1 so the retry attempt can happen.
(cherry picked from commit fb4ec82d97f71963ea7f830cb0bc38abefcbac99)
---

diff --git a/src/guestfs.c b/src/guestfs.c
index e235fdc..ed514dc 100644
--- a/src/guestfs.c
+++ b/src/guestfs.c
@@ -1405,6 +1405,7 @@ guestfs__launch (guestfs_h *g)
                  "libguestfs: warning: unexpected connection from UID %d to port %d\n",
                  uid, null_vmchannel_sock);
         close (sock);
+        sock = -1;
         continue;
       }
     }