Always use trimdomain(), not just #if __FreeBSD_version >= 400004

The port maintainer must be away....

2 files changed, 8 insertions, 22 deletions

diff --git a/security/ssh/files/patch-ao b/security/ssh/files/patch-ao
index a0d88f7a33a9..a208b165706a 100644
--- a/security/ssh/files/patch-ao
+++ b/security/ssh/files/patch-ao
@@ -1,28 +1,27 @@
---- newchannels.c.orig	Fri Apr  9 02:02:31 1999
-+++ newchannels.c	Fri Apr  9 02:28:42 1999
-@@ -271,6 +271,11 @@
+--- newchannels.c.orig	Wed Jul  8 17:40:36 1998
++++ newchannels.c	Mon May  3 23:45:06 1999
+@@ -271,6 +271,10 @@
  #endif /* NEED_SYS_SYSLOG_H */
  #endif /* LIBWRAP */
  
 +#ifdef __FreeBSD__
-+#include <osreldate.h>
 +#include <utmp.h>
 +#endif
 +
  /* Directory in which the fake unix-domain X11 displays reside. */
  #ifndef X11_DIR
  #define X11_DIR "/tmp/.X11-unix"
-@@ -1874,6 +1879,9 @@
+@@ -1874,6 +1878,9 @@
    if (gethostname(hostname, sizeof(hostname)) < 0)
      fatal("gethostname: %.100s", strerror(errno));
    sprintf(buf, "%.400s:%d.%d", hostname, display_number, screen_number);
-+#if __FreeBSD_version >= 400004
++#ifdef __FreeBSD__
 +  trimdomain(buf, UT_HOSTSIZE);
 +#endif
  #else /* HAVE_GETHOSTNAME */
    if (uname(&uts) < 0)
      fatal("uname: %s", strerror(errno));
-@@ -2139,6 +2139,10 @@
+@@ -2388,6 +2395,10 @@
       ssh-agent connections on your system */
    old_umask = umask(S_IRUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
    
diff --git a/security/ssh/files/patch-aw b/security/ssh/files/patch-aw
index 067c8f4ce0f5..ada18457a061 100644
--- a/security/ssh/files/patch-aw
+++ b/security/ssh/files/patch-aw
@@ -1,25 +1,12 @@
 --- login.c.orig	Wed Jul  8 17:40:36 1998
-+++ login.c	Fri Apr  9 01:31:08 1999
-@@ -104,6 +104,10 @@
- #endif /* HAVE_HPUX_TCB_AUTH */
- #include "ssh.h"
- 
-+#ifdef __FreeBSD__
-+#include <osreldate.h>
-+#endif
-+
- /* Returns the time when the user last logged in.  Returns 0 if the 
-    information is not available.  This must be called before record_login. 
-    The host the user logged in from will be returned in buf. */
-@@ -287,12 +291,15 @@
++++ login.c	Mon May  3 23:52:39 1999
+@@ -287,12 +287,13 @@
    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 >= 400004
 +  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));
 -  }