From d635351bf100453ec236d47fe886f6816ec75d50 Mon Sep 17 00:00:00 2001
From: hrs <hrs@FreeBSD.org>
Date: Sat, 17 Aug 2013 07:12:52 +0000
Subject: [PATCH] Unbreak rwhod(8):

- It did not work with GENERIC kernel after r250603 because
  options PROCDESC was required for pdfork(2).  It now just uses fork(2)
  instead when this syscall is not available.

- Fix verify().  This function was broken in r250602 because the outermost
  "()" was removed from the condition !(isalnum() || ispunct()).
  It prevented hostnames including "-", for example.
---
 usr.sbin/rwhod/rwhod.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/usr.sbin/rwhod/rwhod.c b/usr.sbin/rwhod/rwhod.c
index 26b0500c800f..d6a597fc369d 100644
--- a/usr.sbin/rwhod/rwhod.c
+++ b/usr.sbin/rwhod/rwhod.c
@@ -274,6 +274,15 @@ main(int argc, char *argv[])
 		exit(1);
 	if (!quiet_mode) {
 		pid_child_receiver = pdfork(&fdp, 0);
+		if (pid_child_receiver == -1) {
+			if (errno != ENOSYS) {
+				syslog(LOG_ERR, "pdfork: %m");
+				exit(1);
+			} else {
+				pid_child_receiver = fork();
+				fdp = -1;
+			}
+		}
 		if (pid_child_receiver == 0) {
 			receiver_process();
 		} else if (pid_child_receiver > 0) {
@@ -328,7 +337,7 @@ verify(char *name, int maxlen)
 
 	size = 0;
 	while (*name != '\0' && size < maxlen - 1) {
-		if (!isascii(*name) || !isalnum(*name) || ispunct(*name))
+		if (!isascii(*name) || !(isalnum(*name) || ispunct(*name)))
 			return (0);
 		name++;
 		size++;