summaryrefslogtreecommitdiff
path: root/security/ssh/files/patch-ao
diff options
context:
space:
mode:
Diffstat (limited to 'security/ssh/files/patch-ao')
-rw-r--r--security/ssh/files/patch-ao16
1 files changed, 8 insertions, 8 deletions
diff --git a/security/ssh/files/patch-ao b/security/ssh/files/patch-ao
index a208b165706a..cd7a6f36b366 100644
--- a/security/ssh/files/patch-ao
+++ b/security/ssh/files/patch-ao
@@ -1,6 +1,6 @@
---- newchannels.c.orig Wed Jul 8 17:40:36 1998
-+++ newchannels.c Mon May 3 23:45:06 1999
-@@ -271,6 +271,10 @@
+--- newchannels.c.orig Wed May 12 20:19:27 1999
++++ newchannels.c Sun Jun 6 01:49:22 1999
+@@ -282,6 +282,10 @@
#endif /* NEED_SYS_SYSLOG_H */
#endif /* LIBWRAP */
@@ -11,17 +11,17 @@
/* Directory in which the fake unix-domain X11 displays reside. */
#ifndef X11_DIR
#define X11_DIR "/tmp/.X11-unix"
-@@ -1874,6 +1878,9 @@
- if (gethostname(hostname, sizeof(hostname)) < 0)
+@@ -1891,6 +1895,9 @@
fatal("gethostname: %.100s", strerror(errno));
- sprintf(buf, "%.400s:%d.%d", hostname, display_number, screen_number);
+ snprintf(buf, sizeof(buf),
+ "%.400s:%d.%d", hostname, display_number, screen_number);
+#ifdef __FreeBSD__
+ trimdomain(buf, UT_HOSTSIZE);
+#endif
#else /* HAVE_GETHOSTNAME */
if (uname(&uts) < 0)
- fatal("uname: %s", strerror(errno));
-@@ -2388,6 +2395,10 @@
+ fatal("uname: %.100s", strerror(errno));
+@@ -2412,6 +2419,10 @@
ssh-agent connections on your system */
old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);