aboutsummaryrefslogtreecommitdiff
path: root/net/gnu-finger/files/patch-ab
blob: 0fb89a315769dfc365fcef0ca7f6e195a0bb5437 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
--- lib/os.c.orig	Fri Oct 23 06:01:10 1992
+++ lib/os.c	Mon Jan  6 17:47:01 1997
@@ -26,6 +26,8 @@
 #include <sys/acct.h>
 #include <time.h>
 #include <packet.h>
+#include <sys/socket.h>
+#include <netdb.h>
 
 #ifdef HAVE_UTMPX_H
 #include <utmpx.h>
@@ -70,8 +72,12 @@
 
 /* Where the utmp file is located. */
 #ifndef HAVE_GETUTENT
+#ifdef __FreeBSD__
+#define UTMP_FILE "/var/run/utmp"
+#else
 #define UTMP_FILE "/etc/utmp"
 #endif
+#endif
 
 /* A non-null value is the address of the utmp entry which contains the
    information for the user using the console. */
@@ -485,6 +491,7 @@
 
   UTMP **result;
   int result_size = 0;
+  struct hostent *hp; u_long l;
 
 #ifndef HAVE_GETUTENT
   file = open (UTMP_FILE, O_RDONLY);
@@ -529,6 +536,19 @@
 	continue;
 #endif /* sun */
 
+#ifdef __FreeBSD__
+      if (UT(entry, ut_host)[0]) {
+          if (isdigit(UT(entry, ut_host)[0]) && 
+              (long)(l = inet_addr(UT(entry, ut_host))) != -1 &&
+              (hp = gethostbyaddr((char *)&l, sizeof(l), AF_INET))) {
+              if (hp->h_name) {
+                  strncpy(UT(entry, ut_host), hp->h_name, UT_HOSTSIZE);
+                  UT(entry, ut_host)[UT_HOSTSIZE - 1] = '\0';
+              } /* valid hostname */
+          }  /* IP addr */
+      } /* UTMP */
+#endif
+
       for (i = 0; result[i]; i++)
 	{
 	  /* If the same person is logged in more than once, we are
@@ -552,6 +572,9 @@
 	     finding the tty location.  `v0' is what X window terminals
 	     use for the console login window. */
 	  if ((strcmp (result[i]->ut_line, "console") == 0) ||
+#ifdef  __FreeBSD__
+	      (strstr (result[i]->ut_line, "ttyv") != NULL) ||
+#endif
 	      (strcmp (result[i]->ut_line, "v0") == 0))
 	    {
 	      console_user = result[i];