upstream commit

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

Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5

diff --git a/mux.c b/mux.c
index 98e3c0068263e277e0c4ce647b6fb55026a52ace..a8a753b5420b0d41816fddfd12ff8a67bbf6c0e3 100644 (file)
--- 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 <djm@openbsd.org>
  *
@@ -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));