From 67dca60fbb4923b7a11c1645b90a5ca57c03d8be Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Mon, 8 Aug 2016 22:40:57 +0000 Subject: upstream commit Improve error message for overlong ControlPath. ok markus@ djm@ Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5 --- mux.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mux.c') diff --git a/mux.c b/mux.c index 98e3c0068..a8a753b54 100644 --- a/mux.c +++ b/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.60 2016/06/03 03:14:41 dtucker Exp $ */ +/* $OpenBSD: mux.c,v 1.61 2016/08/08 22:40:57 dtucker Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller * @@ -2138,7 +2138,8 @@ muxclient(const char *path) if (strlcpy(addr.sun_path, path, sizeof(addr.sun_path)) >= sizeof(addr.sun_path)) - fatal("ControlPath too long"); + fatal("ControlPath too long ('%s' >= %u bytes)", path, + (unsigned int)sizeof(addr.sun_path)); if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) fatal("%s socket(): %s", __func__, strerror(errno)); -- cgit v1.2.3