summaryrefslogtreecommitdiff
path: root/lib/socket-util.c
diff options
context:
space:
mode:
authorBen Pfaff <blp@nicira.com>2012-02-27 10:58:45 -0800
committerBen Pfaff <blp@nicira.com>2012-03-07 16:33:14 -0800
commite36d0b530ae6c9082d4a088649a43d84e82e7a41 (patch)
treef9ef50ccd9e342fbb142bffc4aa0043900d2bc8b /lib/socket-util.c
parentdaad9316430795b0a9ee5d4ec89b9538101424ed (diff)
downloadopenvswitch-e36d0b530ae6c9082d4a088649a43d84e82e7a41.tar.gz
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 <mhu@nicira.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/socket-util.c')
-rw-r--r--lib/socket-util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/socket-util.c b/lib/socket-util.c
index 12f04321b..37f8c9ad4 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;