From e36d0b530ae6c9082d4a088649a43d84e82e7a41 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 27 Feb 2012 10:58:45 -0800 Subject: [PATCH] socket-util: Unlink Unix domain sockets that bind but fail to connect. The error handling path here failed to clean up bound sockets, by removing them. This fixes the problem. It was easy to observe this bug by running "ovs-vsctl" without "ovsdb-server" running. Bug #9811. Bug #9769. Reported-by: Michael Signed-off-by: Ben Pfaff --- lib/socket-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/socket-util.c b/lib/socket-util.c index 12f04321..37f8c9ad 100644 --- a/lib/socket-util.c +++ b/lib/socket-util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -458,7 +458,7 @@ error: error = EPROTO; } if (bind_path) { - fatal_signal_remove_file_to_unlink(bind_path); + fatal_signal_unlink_file_now(bind_path); } close(fd); return -error; -- 2.30.2