diff options
Diffstat (limited to 'net/radiusd-cistron/files/patch-af')
| -rw-r--r-- | net/radiusd-cistron/files/patch-af | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/net/radiusd-cistron/files/patch-af b/net/radiusd-cistron/files/patch-af index 7e424edaa90f..226c7f855507 100644 --- a/net/radiusd-cistron/files/patch-af +++ b/net/radiusd-cistron/files/patch-af @@ -1,5 +1,5 @@ ---- src/radwho.c.orig Wed Oct 6 23:13:29 1999 -+++ src/radwho.c Fri Mar 10 23:06:27 2000 +--- src/radwho.c.orig Fri Feb 25 05:47:53 2000 ++++ src/radwho.c Wed May 3 18:43:24 2000 @@ -16,6 +16,7 @@ #include <errno.h> #include <sys/stat.h> @@ -8,34 +8,35 @@ #include <time.h> #include <ctype.h> #include <netinet/in.h> -@@ -34,18 +35,20 @@ +@@ -34,18 +35,21 @@ * Header above output and format. */ char *hdr1 = -"Login Name What TTY When From Location"; -char *ufmt1 = "%-10.10s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.16s%s"; +"Login Name What TTY When From Location"; -+char *ufmt1 = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s"; ++char *ufmt1 = "%-16.16s %-17.17s %-5.5s %-4.4s %-9.9s %-9.9s %-.*s%s"; char *ufmt1r = "%s,%s,%s,%s,%s,%s,%s%s"; --char *rfmt1 = "%-10.10s %-17.17s %-5.5s S%-3d %-9.9s %-9.9s %-.19s%s"; -+char *rfmt1 = "%-16.16s %-17.17s %-5.5s S%-3d %-9.9s %-9.9s %-.*s%s"; - char *rfmt1r = "%s,%s,%s,S%d,%s,%s,%s%s"; -+#define FMT1_HOST_SIZE 13 +-char *rfmt1 = "%-10.10s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.19s%s"; ++char *rfmt1 = "%-16.16s %-17.17s %-5.5s %s%-3d %-9.9s %-9.9s %-.*s%s"; + char *rfmt1r = "%s,%s,%s,%s%d,%s,%s,%s%s"; ++#define FMT1_HOST_SIZE 13 char *hdr2 = --"Login Port What When From Location"; --char *ufmt2 = "%-10.10s %-7.7d %-9.9s %-13.13s %-10.10s %-.16s%s"; -+"Login Port What When From Location"; -+char *ufmt2 = "%-16.16s %-7.7s %-9.9s %-13.13s %-10.10s %-.*s%s"; +-"Login Port What When From Location"; +-char *ufmt2 = "%-10.10s %-6.6d %-7.7s %-13.13s %-10.10s %-.16s%s"; ++"Login Port What When From Location"; ++char *ufmt2 = "%-16.16s %-6.6d %-7.7s %-13.13s %-10.10s %-.*s%s"; char *ufmt2r = "%s,%d,%s,%s,%s,%s%s"; --char *rfmt2 = "%-10.10s S%-5d %-9.9s %-13.13s %-10.10s %-.28s%s"; -+char *rfmt2 = "%-16.16s S%-6d %-9.9s %-13.13s %-10.10s %-.*s%s"; - char *rfmt2r = "%s,S%d,%s,%s,%s,%s%s"; -+#define FMT2_HOST_SIZE 19 +-char *rfmt2 = "%-10.10s %s%-5d %-6.6s %-13.13s %-10.10s %-.28s%s"; ++char *rfmt2 = "%-16.16s %s%-5d %-6.6s %-13.13s %-10.10s %-.*s%s"; + char *rfmt2r = "%s,%s%d,%s,%s,%s,%s%s"; ++#define FMT2_HOST_SIZE 19 ++ char *eol = "\n"; NAS *naslist; -@@ -301,7 +304,8 @@ +@@ -301,7 +305,8 @@ return tmp; } if (strncmp(tty, "cu", 2) == 0) { @@ -45,7 +46,7 @@ } return "??"; } -@@ -363,6 +367,8 @@ +@@ -363,6 +368,8 @@ */ int main(int argc, char **argv) { @@ -54,9 +55,9 @@ FILE *fp; struct radutmp rt; struct utmp ut; -@@ -378,6 +384,11 @@ - char *p, *q; - int c; +@@ -378,6 +385,11 @@ + char *p, *q, *portind; + int c, portno; + ioctl(0, TIOCGWINSZ, &ws); + if (ws.ws_col >= 80) { @@ -66,7 +67,7 @@ while((c = getopt(argc, argv, "flhnsipcr")) != EOF) switch(c) { case 'f': fingerd++; -@@ -465,14 +476,17 @@ +@@ -465,14 +477,17 @@ while(fread(&ut, sizeof(ut), 1, fp) == 1) { #ifdef USER_PROCESS if (ut.ut_user[0] && ut.ut_line[0] && @@ -89,7 +90,7 @@ "shell", ttyshort(ut.ut_line), #ifdef __svr4__ -@@ -481,10 +495,11 @@ +@@ -481,10 +496,11 @@ dotime(ut.ut_time), #endif ut.ut_host, @@ -102,7 +103,7 @@ ttyshort(ut.ut_line), "shell", #ifdef __svr4__ -@@ -493,6 +508,7 @@ +@@ -493,6 +509,7 @@ dotime(ut.ut_time), #endif ut.ut_host, @@ -110,15 +111,15 @@ myname, eol); } } -@@ -530,6 +546,7 @@ - rt.nas_port, +@@ -537,6 +554,7 @@ + portind, portno, dotime(rt.time), nasname(ntohl(rt.nas_address)), + FMT1_HOST_SIZE + extra_width, hostname(rt.framed_address), eol); else printf((rawoutput == 0? rfmt2: rfmt2r), -@@ -538,6 +555,7 @@ +@@ -545,6 +563,7 @@ proto(rt.proto, rt.porttype), dotime(rt.time), nasname(ntohl(rt.nas_address)), |