Re: [PATCH 2/2] credential-cache--daemon.c: unlink() a potentially stale unix socket
- From
Jeff King <peff@peff.net>
- Date
- Oct 22, 2011, 19:19 UTC
- Message-ID
- <20111022191905.GD1785@sigill.intra.peff.net>
- In-Reply-To
- <4EA2FCA0.70002@ramsay1.demon.co.uk>
On Sat, Oct 22, 2011 at 06:25:52PM +0100, Ramsay Jones wrote:
Show 12 quoted lines
> diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
> index ee2c15a..c5fb1b2 100644
> --- a/credential-cache--daemon.c
> +++ b/credential-cache--daemon.c
> @@ -230,6 +230,7 @@ static void serve_cache(const char *socket_path)
> {
> int fd;
>
> + unlink(socket_path);
> fd = unix_stream_listen(socket_path);
> if (fd < 0)
> die_errno("unable to bind to '%s'", socket_path);I think this is a sane thing to do, if it's more portable. We can just get rid of the double-bind attempt in unix_stream_listen, now. I suspect this unlink should probably just go directly into unix_stream_listen, too.
-Peff