[openssh-commits] [openssh] 02/02: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit 67dca60fbb4923b7a11c1645b90a5ca57c03d8be
Author: dtucker at openbsd.org <dtucker at openbsd.org>
Date:   Mon Aug 8 22:40:57 2016 +0000

    upstream commit
    
    Improve error message for overlong ControlPath.  ok markus@
    djm@
    
    Upstream-ID: aed374e2e88dd3eb41390003e5303d0089861eb5
---
 mux.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mux.c b/mux.c
index 98e3c00..a8a753b 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 <djm at 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));

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.