From: dtucker <dtucker@openbsd.org>
Date: Mon, 8 Aug 2016 22:40:57 +0000 (+0000)
Subject: Improve error message for overlong ControlPath.  ok markus@ djm@
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fe66ebf209069d32287c26847acfe09236583ba3;p=openbsd

Improve error message for overlong ControlPath.  ok markus@ djm@
---

diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c
index c797fc6956d..ac9bcae2b07 100644
--- a/usr.bin/ssh/mux.c
+++ b/usr.bin/ssh/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 <djm@openbsd.org>
  *
@@ -2116,7 +2116,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));