Merge 6.5p1.

* New upstream release (http://www.openssh.com/txt/release-6.5,
  LP: #1275068):
  - ssh(1): Add support for client-side hostname canonicalisation using a
    set of DNS suffixes and rules in ssh_config(5).  This allows
    unqualified names to be canonicalised to fully-qualified domain names
    to eliminate ambiguity when looking up keys in known_hosts or checking
    host certificate names (closes: #115286).

1 files changed, 7 insertions, 2 deletions

diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c
index 2965f689e..9f7ca14c2 100644
--- a/openbsd-compat/setproctitle.c
+++ b/openbsd-compat/setproctitle.c
@@ -67,7 +67,8 @@ static size_t argv_env_len = 0;
 void
 compat_init_setproctitle(int argc, char *argv[])
 {
-#if defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
+#if !defined(HAVE_SETPROCTITLE) && \
+    defined(SPT_TYPE) && SPT_TYPE == SPT_REUSEARGV
         extern char **environ;
         char *lastargv = NULL;
         char **envp = environ;
@@ -125,6 +126,7 @@ setproctitle(const char *fmt, ...)
         va_list ap;
         char buf[1024], ptitle[1024];
         size_t len;
+        int r;
         extern char *__progname;
 #if SPT_TYPE == SPT_PSTAT
         union pstun pst;
@@ -137,13 +139,16 @@ setproctitle(const char *fmt, ...)
 
         strlcpy(buf, __progname, sizeof(buf));
 
+        r = -1;
         va_start(ap, fmt);
         if (fmt != NULL) {
                 len = strlcat(buf, ": ", sizeof(buf));
                 if (len < sizeof(buf))
-                        vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
+                        r = vsnprintf(buf + len, sizeof(buf) - len , fmt, ap);
         }
         va_end(ap);
+        if (r == -1 || (size_t)r >= sizeof(buf) - len)
+                return;
         strnvis(ptitle, buf, sizeof(ptitle),
             VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL);