3571e53040
patches for easier mirroring, to eliminate a special copy, to make www.freebsd.org/security a full copy of security.freebsd.org and be eventually be the same. For now files are just sitting there. The symlinks are missing. Discussed on: www (repository location) Discussed with: simon (so)
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
Index: rwhod.c
|
|
===================================================================
|
|
RCS file: /mnt/ncvs/src/usr.sbin/rwhod/rwhod.c,v
|
|
retrieving revision 1.14
|
|
retrieving revision 1.15
|
|
diff -u -r1.14 -r1.15
|
|
--- rwhod.c 2000/07/12 00:47:33 1.14
|
|
+++ rwhod.c 2000/12/22 21:30:15 1.15
|
|
@@ -56,6 +56,7 @@
|
|
#include <net/if_dl.h>
|
|
#include <net/route.h>
|
|
#include <netinet/in.h>
|
|
+#include <arpa/inet.h>
|
|
#include <protocols/rwhod.h>
|
|
|
|
#include <ctype.h>
|
|
@@ -277,17 +278,22 @@
|
|
continue;
|
|
}
|
|
if (from.sin_port != sp->s_port && !insecure_mode) {
|
|
- syslog(LOG_WARNING, "%d: bad from port",
|
|
- ntohs(from.sin_port));
|
|
+ syslog(LOG_WARNING, "%d: bad source port from %s",
|
|
+ ntohs(from.sin_port), inet_ntoa(from.sin_addr));
|
|
continue;
|
|
}
|
|
+ if (cc < WHDRSIZE) {
|
|
+ syslog(LOG_WARNING, "short packet from %s",
|
|
+ inet_ntoa(from.sin_addr));
|
|
+ continue;
|
|
+ }
|
|
if (wd.wd_vers != WHODVERSION)
|
|
continue;
|
|
if (wd.wd_type != WHODTYPE_STATUS)
|
|
continue;
|
|
if (!verify(wd.wd_hostname, sizeof wd.wd_hostname)) {
|
|
- syslog(LOG_WARNING, "malformed host name from %x",
|
|
- from.sin_addr);
|
|
+ syslog(LOG_WARNING, "malformed host name from %s",
|
|
+ inet_ntoa(from.sin_addr));
|
|
continue;
|
|
}
|
|
(void) snprintf(path, sizeof path, "whod.%s", wd.wd_hostname);
|