From 98c2924cfa84a7f30b17636bd5632e53a0fa002e Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 7 Jan 2012 12:54:36 +0100 Subject: [PATCH] credentials: unable to connect to cache daemon Error out if we just spawned the daemon and yet we cannot connect. And always release the string buffer. Signed-off-by: Clemens Buchacher Acked-by: Jeff King Signed-off-by: Junio C Hamano --- credential-cache.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/credential-cache.c b/credential-cache.c index dc98372e59..b15a9a7449 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -71,11 +71,10 @@ static void do_cache(const char *socket, const char *action, int timeout, die_errno("unable to relay credential"); } - if (!send_request(socket, &buf)) - return; - if (flags & FLAG_SPAWN) { + if (send_request(socket, &buf) < 0 && (flags & FLAG_SPAWN)) { spawn_daemon(socket); - send_request(socket, &buf); + if (send_request(socket, &buf) < 0) + die_errno("unable to connect to cache daemon"); } strbuf_release(&buf); }