kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only use trimdomain() if __FreeBSD_version > 320000

Browse source 
It was available in 3.0 & 3.1 but would truncate at UT_HOSTSIZE-1
This commit is contained in:
Brian Somers 1999-06-18 11:37:30 +00:00
parent 941584ebd3
commit 2170922420
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=19543
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
security/ssh/files/patch-ao
View file

@ -1,27 +1,28 @@
--- newchannels.c.orig Wed May 12 20:19:27 1999
+++ newchannels.c Sun Jun 6 01:49:22 1999
@@ -282,6 +282,10 @@
--- newchannels.c.orig Wed May 12 12:19:27 1999
+++ newchannels.c Fri Jun 18 12:10:26 1999
@@ -282,6 +282,11 @@
#endif /* NEED_SYS_SYSLOG_H */
#endif /* LIBWRAP */
+#ifdef __FreeBSD__
+#include <utmp.h>
+#include <osreldate.h>
+#endif
+
/* Directory in which the fake unix-domain X11 displays reside. */
#ifndef X11_DIR
#define X11_DIR "/tmp/.X11-unix"
@@ -1891,6 +1895,9 @@
@@ -1891,6 +1896,9 @@
fatal("gethostname: %.100s", strerror(errno));
snprintf(buf, sizeof(buf),
"%.400s:%d.%d", hostname, display_number, screen_number);
+#ifdef __FreeBSD__
+#if __FreeBSD_version >= 320000
+ trimdomain(buf, UT_HOSTSIZE);
+#endif
#else /* HAVE_GETHOSTNAME */
if (uname(&uts) < 0)
fatal("uname: %.100s", strerror(errno));
@@ -2412,6 +2419,10 @@
@@ -2412,6 +2420,10 @@
ssh-agent connections on your system */
old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);

18
security/ssh/files/patch-aw
View file

@ -1,12 +1,24 @@
--- login.c.orig Wed May 12 20:19:26 1999
+++ login.c Sun Jun 6 01:51:33 1999
@@ -301,12 +301,13 @@
--- login.c.orig Wed May 12 12:19:26 1999
+++ login.c Fri Jun 18 12:11:20 1999
@@ -117,6 +117,9 @@
#include <hpsecurity.h>
#include <prot.h>
#endif /* HAVE_HPUX_TCB_AUTH */
+#ifdef __FreeBSD__
+#include <osreldate.h>
+#endif
#include "ssh.h"
/* Returns the time when the user last logged in. Returns 0 if the
@@ -301,12 +304,15 @@
strncpy(u.ut_user, user, sizeof(u.ut_user));
#endif /* HAVE_NAME_IN_UTMP */
#ifdef HAVE_HOST_IN_UTMP
- strncpy(u.ut_host, host, sizeof(u.ut_host));
#ifdef __FreeBSD__
+#if __FreeBSD_version >= 320000
+ trimdomain(host, sizeof u.ut_host);
+#endif
if (strlen(host) > sizeof(u.ut_host)) {
strncpy(u.ut_host, get_remote_ipaddr(), sizeof(u.ut_host));
- }